summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrey Borzenkov <bor@users.sourceforge.net>2009-02-01 08:52:47 +0000
committerAndrey Borzenkov <bor@users.sourceforge.net>2009-02-01 08:52:47 +0000
commitae66040f86d7a3a08eb4bc766cf79d20a392a518 (patch)
tree2c31ec80be25cdb6609a0642a74d91eb3b6ffe05
parentdebd4b826ab92133bc4bb94ebdc42a28b82bfb9f (diff)
downloadzsh-ae66040f86d7a3a08eb4bc766cf79d20a392a518.tar.gz
zsh-ae66040f86d7a3a08eb4bc766cf79d20a392a518.tar.xz
zsh-ae66040f86d7a3a08eb4bc766cf79d20a392a518.zip
26504: document that local_options does not restore everything
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/options.yo5
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ff4711263..29161982b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-01  Andrey Borzenkov <bor@zsh.org>
+
+	* 26504: Doc/Zsh/options.yo: document that LOCAL_OPTIONS
+	does not restore PRIVILEGED and RESTRICTED
+
 2009-01-30  Clint Adams  <clint@zsh.org>
 
 	* 26494: Completion/Unix/Command/_pydoc: completion for pydoc.
@@ -11071,5 +11076,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4546 $                         
+* $Revision: 1.4547 $                         
 *****************************************************
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index 4bd82f324..d8c0bb315 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -1109,8 +1109,9 @@ temporarily to the name of the function/script.
 pindex(LOCAL_OPTIONS)
 item(tt(LOCAL_OPTIONS) <K>)(
 If this option is set at the point of return from a shell function,
-all the options (including this one) which were in force upon entry to
-the function are restored.  Otherwise, only this option and the
+most options (including this one) which were in force upon entry to
+the function are restored; options that are not restored are
+tt(PRIVILEGED) and tt(RESTRICTED).  Otherwise, only this option and the
 tt(XTRACE) and tt(PRINT_EXIT_VALUE) options are restored.  Hence
 if this is explicitly unset by a shell function the other options in
 force at the point of return will remain so.