mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

unposted: clear ERRFLAG_ERROR before invoking immortal widget (cf. 39934)

Browse source 
Updates commit cbb9ca3d
This commit is contained in:
Bart Schaefer 2016-11-23 18:15:17 -08:00
parent 07509be51a
commit c0f95d07e7
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

6
Src/Zle/zle_main.c
View file

@ -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;