diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Doc/Zsh/builtins.yo | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 39ad8485b..03c1fd83a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-02-08 Andrey Borzenkov <bor@zsh.org> + + * 26530: Doc/Zsh/builtins.yo: clarify that "emulate -c" + restores all options on return, not only those related + to emulation + 2009-02-07 Peter Stephenson <p.w.stephenson@ntlworld.com> * Allan Caffee <allan.caffee@gmail.com>: 26532: index option @@ -11103,5 +11109,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4553 $ +* $Revision: 1.4554 $ ***************************************************** diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index 9927e9f71..4487ee175 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -357,7 +357,8 @@ noderef(Compatibility) . If tt(-c) tt(arg) is given, evaluate tt(arg) after temporary setting -requested emulation. Emulation will be restored before tt(emulate) returns. +requested emulation. Emulation and all options will be restored to their +original values before tt(emulate) returns. If the tt(-R) option is given, all options are reset to their default value corresponding to the specified emulation |