summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/init.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b292f5404..538dd00fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-04 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * Src/init.c: 25385: extend 25367 to fix another bug
+ with trapreturn trampling on status.
+
2008-08-04 Peter Stephenson <pws@csr.com>
* users/13095: configure.ac: we don't want that
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;
}