diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/builtins.yo | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index cee25315c..688c9cd13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-09-12 Peter Stephenson <p.w.stephenson@ntlworld.com> + * unposted: Doc/Zsh/builtins.yo: note exit trap runs before + zshexit hook. + * 28250: Doc/Zsh/options.yo, Src/options.c, Src/signals.c, Src/zsh.h, Test/C03traps.ztst: POSIX_TRAPS option. @@ -13626,5 +13629,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5076 $ +* $Revision: 1.5077 $ ***************************************************** diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index 2aa0affa9..02071fbeb 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -1424,7 +1424,8 @@ The value of tt($?) at the start of execution is the exit status of the shell or the return status of the function exiting. If var(sig) is tt(0) or tt(EXIT) and the tt(trap) statement is not executed inside the body of a function, -then the command var(arg) is executed when the shell terminates. +then the command var(arg) is executed when the shell terminates; the +trap runs before any tt(zshexit) hook functions. tt(ZERR), tt(DEBUG), and tt(EXIT) traps are not executed inside other traps. tt(ZERR) and tt(DEBUG) traps are kept within subshells, while |