diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-08-07 16:25:14 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-08-07 16:25:14 +0000 |
| commit | 2706eac45492b0fcdfc3cf104ac947e65d09ee25 (patch) | |
| tree | ff7f6e2a05231a8444589e54c95313114ebcae07 /Src/builtin.c | |
| parent | c4f33330f6797d0c199abf522f79c3ccac88ed55 (diff) | |
| download | zsh-2706eac45492b0fcdfc3cf104ac947e65d09ee25.tar.gz zsh-2706eac45492b0fcdfc3cf104ac947e65d09ee25.tar.xz zsh-2706eac45492b0fcdfc3cf104ac947e65d09ee25.zip | |
25415: Make DEBUG_BEFORE_CMD the default.
Reuse ERR_EXIT in DEBUG traps. Clean up trapreturn code.
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index e1378d901..ee44b3776 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -4462,8 +4462,10 @@ bin_break(char *name, char **argv, UNUSED(Options ops), int func) retflag = 1; breaks = loops; lastval = num; - if (trapreturn == -2) - trapreturn = lastval; + if (trap_state == TRAP_STATE_PRIMED && trap_return == -2) { + trap_state = TRAP_STATE_FORCE_RETURN; + trap_return = lastval; + } return lastval; } zexit(num, 0); /* else treat return as logout/exit */ |