diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Zsh/builtins.yo | 9 | ||||
| -rw-r--r-- | Doc/Zsh/func.yo | 8 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 9 |
3 files changed, 22 insertions, 4 deletions
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index bcd03be98..b14bc58fb 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -1304,8 +1304,15 @@ 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). + If var(sig) is tt(DEBUG) then var(arg) will be executed -after each command. +before each command if the option tt(DEBUG_BEFORE_CMD) is set +(as it is by default), else after each command. In the former +case it is possible to skip the next command; see +the description of the tt(ERR_EXIT) option in +ifzman(zmanref(zshoptions))\ +ifnzman(noderef(Description of Options)). + If var(sig) is tt(0) or tt(EXIT) and the tt(trap) statement is executed inside the body of a function, then the command var(arg) is executed after the function completes. diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo index 83ab8bc5d..36b135275 100644 --- a/Doc/Zsh/func.yo +++ b/Doc/Zsh/func.yo @@ -308,8 +308,12 @@ executed inside other traps. ) findex(TRAPDEBUG) item(tt(TRAPDEBUG))( -Executed after each command. If the option tt(DEBUG_BEFORE_CMD) -is set, executed before each command instead. +If the option tt(DEBUG_BEFORE_CMD) is set (as it is by default), executed +before each command; otherwise executed after each command. In the former +case it is possible to skip the next command; see the description of the +tt(ERR_EXIT) option in +ifzman(zmanref(zshoptions))\ +ifnzman(noderef(Description of Options)). ) findex(TRAPEXIT) item(tt(TRAPEXIT))( diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index eec951d4f..a0d1f9c0d 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -1046,7 +1046,7 @@ ifnzman(Arithmetic Evaluation)\ ifzman(the section ARITHMETIC EVALUATION in zmanref(zshmisc)) has an explicit list. ) -pindex(DEBUG_BEFORE_CMD) +pindex(DEBUG_BEFORE_CMD <D>) cindex(traps, DEBUG, before or after command) cindex(DEBUG trap, before or after command) item(tt(DEBUG_BEFORE_CMD))( @@ -1060,6 +1060,13 @@ item(tt(ERR_EXIT) (tt(-e), ksh: tt(-e)))( If a command has a non-zero exit status, execute the tt(ZERR) trap, if set, and exit. This is disabled while running initialization scripts. + +The behaviour is also disabled inside tt(DEBUG) traps. In this +case the option is handled specially: it is unset on entry to +the trap. If the option tt(DEBUG_BEFORE_CMD) is set, +as it is by default, and the option tt(ERR_EXIT) is found to have been set +on exit, then the command for which the tt(DEBUG) trap is being executed is +skipped. The option is restored after the trap exits. ) pindex(ERR_RETURN) cindex(function return, on error) |