diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-03-14 19:41:18 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-03-14 19:41:18 +0000 |
| commit | 6ebb9f6a31f362ecd55c79e647fe09c0b0712039 (patch) | |
| tree | 9e0282c0212a048fc0ae93107b762422ff179adc | |
| parent | 458e66574b20087088a6aa779e7c44e711b1645b (diff) | |
| download | zsh-6ebb9f6a31f362ecd55c79e647fe09c0b0712039.tar.gz zsh-6ebb9f6a31f362ecd55c79e647fe09c0b0712039.tar.xz zsh-6ebb9f6a31f362ecd55c79e647fe09c0b0712039.zip | |
unposted: document effect of 32479 on POSIX_TRAPS
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 76b6e1555..886fbfc53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-14 Peter Stephenson <p.w.stephenson@ntlworld.com> + * unposted: Doc/Zsh/options.yo: document effect of 32479. + * Jun T: 32482: Doc/zman.yo: fix character translation table usage with some versions of Yodl. diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index 3c6ea63b8..7cfbdef23 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -2037,7 +2037,10 @@ When the is option is set, the usual zsh behaviour of executing traps for tt(EXIT) on exit from shell functions is suppressed. In that case, manipulating tt(EXIT) traps always alters the global trap for exiting the shell; the tt(LOCAL_TRAPS) option is -ignored for the tt(EXIT) trap. +ignored for the tt(EXIT) trap. Furthermore, a tt(return) statement +executed in a trap with no argument passes back from the function the +value from the surrounding context, not from code executed within the +trap. ) pindex(SH_FILE_EXPANSION) pindex(NO_SH_FILE_EXPANSION) |