about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-10-01 11:34:48 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-10-01 11:34:48 +0000
commit57418f3c7d72bda89fe5819882ed6d0a42c3a1b6 (patch)
treed2f8ed036a60b7fe9b0975b8612a57e022280905 /Src
parent06cf28875e9046de8caf396cf5aa98f7473ef393 (diff)
downloadzsh-57418f3c7d72bda89fe5819882ed6d0a42c3a1b6.tar.gz
zsh-57418f3c7d72bda89fe5819882ed6d0a42c3a1b6.tar.xz
zsh-57418f3c7d72bda89fe5819882ed6d0a42c3a1b6.zip
25791: force return from eval-style DEBUG trap lost status
Diffstat (limited to 'Src')
-rw-r--r--Src/exec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Src/exec.c b/Src/exec.c
index 1685c799e..5cc92b548 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -1091,7 +1091,8 @@ execlist(Estate state, int dont_change_job, int exiting)
 	    exiting = donetrap;
 	    ret = lastval;
 	    dotrap(SIGDEBUG);
-	    lastval = ret;
+	    if (!retflag)
+		lastval = ret;
 	    donetrap = exiting;
 	    noerrexit = oldnoerrexit;
 	    /*
@@ -1230,7 +1231,8 @@ sublist_done:
 	    exiting = donetrap;
 	    ret = lastval;
 	    dotrap(SIGDEBUG);
-	    lastval = ret;
+	    if (!retflag)
+		lastval = ret;
 	    donetrap = exiting;
 	    noerrexit = oldnoerrexit;
 	    opts[ERREXIT] = oerrexit_opt;