From c0f95d07e7be34a30047a8202aeb01b864600151 Mon Sep 17 00:00:00 2001
From: Bart Schaefer <schaefer@zsh.org>
Date: Wed, 23 Nov 2016 18:15:17 -0800
Subject: unposted: clear ERRFLAG_ERROR before invoking immortal widget (cf.
 39934)

Updates commit cbb9ca3d
---
 Src/Zle/zle_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Src/Zle/zle_main.c')

diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 938dc0e29..15ea79643 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1498,8 +1498,12 @@ execzlefunc(Thingy func, char **args, int set_bindk)
 	    opts[XTRACE] = oxt;
 	    sfcontext = osc;
 	    endparamscope();
-	    if (errflag == ERRFLAG_ERROR && !(ret = execimmortal(func, args)))
+	    if (errflag == ERRFLAG_ERROR) {
+		int saverr = errflag;
 		errflag &= ~ERRFLAG_ERROR;
+		if ((ret = execimmortal(func, args)) != 0)
+		    errflag |= saverr;
+	    }
 	    lastcmd = w->flags & ~(WIDGET_INUSE|WIDGET_FREE);
 	    if (inuse) {
 		w->flags &= WIDGET_INUSE|WIDGET_FREE;
-- 
cgit 1.4.1