about summary refs log tree commit diff
path: root/Src/init.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-08-04 19:47:46 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-08-04 19:47:46 +0000
commit541e5e249023ff8cc99192604a92a5a5360f175d (patch)
tree1da91bd927058bdea21307ccd4827f8471e81a3b /Src/init.c
parentf1433d5f8bdd9ff6789566f5514293d786a714af (diff)
downloadzsh-541e5e249023ff8cc99192604a92a5a5360f175d.tar.gz
zsh-541e5e249023ff8cc99192604a92a5a5360f175d.tar.xz
zsh-541e5e249023ff8cc99192604a92a5a5360f175d.zip
25385: fix another bug with trapreturn trampling on status
Diffstat (limited to 'Src/init.c')
-rw-r--r--Src/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Src/init.c b/Src/init.c
index a21b39639..f2dc99af7 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -191,7 +191,7 @@ loop(int toplevel, int justonce)
 	    exit(lastval);
 	if (((!interact || sourcelevel) && errflag) || retflag)
 	    break;
-	if (trapreturn >= 0) {
+	if (intrap && trapreturn >= 0) {
 	    lastval = trapreturn;
 	    trapreturn = 0;
 	}