summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/builtins.yo5
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fbcf51ee..2742f59cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Peter Stephenson  <pws@csr.com>
+
+	* 30780: Doc/Zsh/builds.yo: document that set -o failures are
+	hard but setopt failures are soft.
+
 2012-11-07  Oliver Kiddle <opk@zsh.org>
 
 	* Benjamin R. Haskell: 30737: Completion/Unix/Command/_git:
@@ -302,5 +307,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5753 $
+* $Revision: 1.5754 $
 *****************************************************
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 37319c9b0..f3a7f6a97 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -1361,6 +1361,11 @@ or without the tt(no) prefix remains the same in this case.
 If the tt(-m) flag is given the arguments are taken as patterns
 (which should be quoted to protect them from filename expansion), and all
 options with names matching these patterns are set.
+
+Note that a bad option name does not cause execution of subsequent shell
+code to be aborted; this is behaviour is different from that of `tt(set
+-o)'.  This is because tt(set) is regarded as a special builtin by the
+POSIX standard, but tt(setopt) is not.
 )
 findex(shift)
 cindex(parameters, positional)