summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/options.yo28
2 files changed, 8 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 97d2f3383..f6dee5ca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2009-03-03 Peter Stephenson <pws@csr.com>
- * Doc/Zsh/options.yo, Src/lex.c, Src/options.c, Src/zsh.h,
+ * 26676: Doc/Zsh/options.yo: redirect to main description
+ of reserved words instead.
+
+ * 26675: Doc/Zsh/options.yo, Src/lex.c, Src/options.c, Src/zsh.h,
Test/A02alias.ztst: add POSIX_ALIASES option.
* 26671: Completion/Zsh/Command/_zattr, Doc/Zsh/.distfiles,
@@ -11311,5 +11314,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4594 $
+* $Revision: 1.4595 $
*****************************************************
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index 70038c8c6..d1e1eab52 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -1715,31 +1715,9 @@ pindex(NOPOSIXALIASES)
item(tt(POSIX_ALIASES) <K> <S>)(
When this option is set, reserved words are not candidates for
alias expansion: it is still possible to declare any of them as an alias,
-but the alias will never be expanded. Reserved words are
-tt(!),
-tt([[),
-tt({),
-tt(}),
-tt(case),
-tt(coproc),
-tt(do),
-tt(done),
-tt(elif),
-tt(else),
-tt(end),
-tt(esac),
-tt(fi),
-tt(for),
-tt(foreach),
-tt(function),
-tt(if),
-tt(nocorrect),
-tt(repeat),
-tt(select),
-tt(then),
-tt(time),
-tt(until),
-tt(while).
+but the alias will never be expanded. Reserved words are described in
+ifnzman(noderef(Reserved Words))\
+ifzman(the section RESERVED WORDS in zmanref(zshmisc)).
Alias expansion takes place while text is being read; hence when this
option is set it does not take effect until the end of any function or