From 541e5e249023ff8cc99192604a92a5a5360f175d Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Mon, 4 Aug 2008 19:47:46 +0000
Subject: 25385: fix another bug with trapreturn trampling on status

---
 ChangeLog  | 5 +++++
 Src/init.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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;
 	}
-- 
cgit 1.4.1