From a2579351a1a33f97fa14e3993b5091e04598f992 Mon Sep 17 00:00:00 2001
From: Paul Ackersviller <packersv@users.sourceforge.net>
Date: Sun, 11 Nov 2007 20:15:49 +0000
Subject: Merge of 23101: : ZERR traps had various odd features when combined
 with function returns.

---
 Src/signals.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Src')

diff --git a/Src/signals.c b/Src/signals.c
index 8b70c880a..a6c60b604 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -975,6 +975,7 @@ dotrapargs(int sig, int *sigtr, void *sigfn)
     char *name, num[4];
     int trapret = 0;
     int obreaks = breaks;
+    int oretflag = retflag;
     int isfunc;
 
     /* if signal is being ignored or the trap function		      *
@@ -1012,7 +1013,7 @@ dotrapargs(int sig, int *sigtr, void *sigfn)
 
     lexsave();
     execsave();
-    breaks = 0;
+    breaks = retflag = 0;
     runhookdef(BEFORETRAPHOOK, NULL);
     if (*sigtr & ZSIG_FUNC) {
 	int osc = sfcontext;
@@ -1079,11 +1080,16 @@ dotrapargs(int sig, int *sigtr, void *sigfn)
 	if (isfunc) {
 	    breaks = loops;
 	    errflag = 1;
+	    lastval = trapret;
 	} else {
 	    lastval = trapret-1;
 	}
+	/* return triggered */
+	retflag = 1;
     } else {
 	breaks += obreaks;
+	/* return not triggered: restore old flag */
+	retflag = oretflag;
 	if (breaks > loops)
 	    breaks = loops;
     }
-- 
cgit 1.4.1