From cb26e11c70f95c72e300e1f4f16b33e4e5f54d21 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sat, 3 Oct 2015 22:11:09 -0700
Subject: unposted: back out 36707, add test case for 36766

---
 Src/exec.c | 2 +-
 Src/loop.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'Src')

diff --git a/Src/exec.c b/Src/exec.c
index 235faf3ba..bcc8065a2 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -1409,7 +1409,7 @@ sublist_done:
 			exit(lastval);
 		}
 		if (errreturn) {
-		    retflag = 2;
+		    retflag = 1;
 		    breaks = loops;
 		}
 	    }
diff --git a/Src/loop.c b/Src/loop.c
index 7d1528efe..4def9b652 100644
--- a/Src/loop.c
+++ b/Src/loop.c
@@ -552,12 +552,8 @@ execif(Estate state, int do_exec)
 	    run = 1;
 	    break;
 	}
-	if (retflag) {
-	    if (retflag == 2)
-		retflag = 0; /* Never ERR_RETURN here */
-	    else
-		break;
-	}
+	if (retflag)
+	    break;
 	s = 1;
 	state->pc = next;
     }
-- 
cgit 1.4.1