diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2019-04-09 20:45:37 +0200 |
|---|---|---|
| committer | Peter Stephenson <p.stephenson@samsung.com> | 2019-04-10 09:41:04 +0100 |
| commit | c5519372808d78519e1bac2db165d19a34534f74 (patch) | |
| tree | 45e5f952339bb9c97bb62e0f2907f5626ffc7186 /Src/Zle/zle_main.c | |
| parent | fe228c5984339a303c88279429ee52e5af58de05 (diff) | |
| download | zsh-c5519372808d78519e1bac2db165d19a34534f74.tar.gz zsh-c5519372808d78519e1bac2db165d19a34534f74.tar.xz zsh-c5519372808d78519e1bac2db165d19a34534f74.zip | |
44215: Maintain LASTWIDGET across reset-prompt.
This avoids side effects of asynchronous notifications.
Diffstat (limited to 'Src/Zle/zle_main.c')
| -rw-r--r-- | Src/Zle/zle_main.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 71930f76b..d54e928a6 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1073,7 +1073,7 @@ redrawhook(void) * temporarily reset state for special variable handling etc. */ incompfunc = 0; - execzlefunc(initthingy, args, 1); + execzlefunc(initthingy, args, 1, 0); incompfunc = old_incompfunc; /* Restore errflag and retflag as zlecallhook() does */ @@ -1136,7 +1136,7 @@ zlecore(void) eofsent = 1; break; } - if (execzlefunc(bindk, zlenoargs, 0)) { + if (execzlefunc(bindk, zlenoargs, 0, 0)) { handlefeep(zlenoargs); if (eofsent) break; @@ -1386,7 +1386,7 @@ execimmortal(Thingy func, char **args) { Thingy immortal = rthingy_nocreate(dyncat(".", func->nam)); if (immortal) - return execzlefunc(immortal, args, 0); + return execzlefunc(immortal, args, 0, 0); return 1; } @@ -1398,13 +1398,14 @@ execimmortal(Thingy func, char **args) /**/ int -execzlefunc(Thingy func, char **args, int set_bindk) +execzlefunc(Thingy func, char **args, int set_bindk, int set_lbindk) { int r = 0, ret = 0, remetafy = 0; int nestedvichg = vichgflag; int isrepeat = (viinrepeat == 3); Widget w; Thingy save_bindk = bindk; + Thingy save_lbindk = lbindk; if (set_bindk) bindk = func; @@ -1412,6 +1413,8 @@ execzlefunc(Thingy func, char **args, int set_bindk) unmetafy_line(); remetafy = 1; } + if (set_lbindk) + refthingy(save_lbindk); if (isrepeat) viinrepeat = 2; @@ -1535,7 +1538,10 @@ execzlefunc(Thingy func, char **args, int set_bindk) redup(osi, 0); } } - if (r) { + if (set_lbindk) { + unrefthingy(lbindk); + lbindk = save_lbindk; + } else if (r) { unrefthingy(lbindk); refthingy(func); lbindk = func; |