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/Zsh/builtins.yo | |
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/Zsh/builtins.yo')
-rw-r--r-- | Doc/Zsh/builtins.yo | 4 |
1 files changed, 1 insertions, 3 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) |