diff options
| author | Bart Schaefer <schaefer@zsh.org> | 2016-11-23 18:15:17 -0800 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2016-11-23 18:15:17 -0800 |
| commit | c0f95d07e7be34a30047a8202aeb01b864600151 (patch) | |
| tree | 57d960358318aed5658a5306c095b7c4ee0f5dce | |
| parent | 07509be51ae06b699dba6a3a85d76d79812a0d75 (diff) | |
| download | zsh-c0f95d07e7be34a30047a8202aeb01b864600151.tar.gz zsh-c0f95d07e7be34a30047a8202aeb01b864600151.tar.xz zsh-c0f95d07e7be34a30047a8202aeb01b864600151.zip | |
unposted: clear ERRFLAG_ERROR before invoking immortal widget (cf. 39934)
Updates commit cbb9ca3d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a1a4a0850..58ed68801 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-23 Bart Schaefer <schaefer@zsh.org> + + * unposted: Src/Zle/zle_main.c: clear ERRFLAG_ERROR before + invoking immortal widget (cf. 39934) + 2016-11-23 Oliver Kiddle <opk@zsh.org> * unposted: Test/Y03arguments.ztst: partial match test case 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; |