diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-05 00:25:45 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-05 00:25:45 +0000 |
| commit | 1a6e2924494e6bce74a6c3989ff6e3b5b425ca33 (patch) | |
| tree | 4ca2ab2b762c24e377f9db32092b9cb96237707c /Doc | |
| parent | 542b84358933e363773afe2105c9fa5ee494e18b (diff) | |
| download | zsh-1a6e2924494e6bce74a6c3989ff6e3b5b425ca33.tar.gz zsh-1a6e2924494e6bce74a6c3989ff6e3b5b425ca33.tar.xz zsh-1a6e2924494e6bce74a6c3989ff6e3b5b425ca33.zip | |
Reverse the merging of 21296 onto 4.2 branch; the builtin.c piece had a merge conflict, and my resolution of it caused test failure in C03.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Zsh/builtins.yo | 4 | ||||
| -rw-r--r-- | Doc/Zsh/func.yo | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index ab12428fb..30d2cf84b 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -1192,9 +1192,7 @@ The tt(trap) command with no arguments prints a list of commands associated with each signal. If var(sig) is tt(ZERR) then var(arg) will be executed -after each command with a nonzero exit status. tt(ERR) is an alias -for tt(ZERR) on systems that have no tt(SIGERR) signal (this is the -usual case). +after each command with a nonzero exit status. If var(sig) is tt(DEBUG) then var(arg) will be executed after each command. If var(sig) is tt(0) or tt(EXIT) diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo index 16a838f9d..18fcd62e2 100644 --- a/Doc/Zsh/func.yo +++ b/Doc/Zsh/func.yo @@ -252,14 +252,11 @@ The value of tt($?) at the start of execution is the exit status of the shell or the return status of the function exiting. ) findex(TRAPZERR) -findex(TRAPERR) item(tt(TRAPZERR))( Executed whenever a command has a non-zero exit status. However, the function is not executed if the command occurred in a sublist followed by `tt(&&)' or `tt(||)'; only the final command in a sublist of this type -causes the trap to be executed. The function tt(TRAPERR) acts the same as -tt(TRAPZERR) on systems where there is no tt(SIGERR) (this is the usual -case). +causes the trap to be executed. ) enditem() |