diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-12-07 14:32:52 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-12-07 14:32:52 +0000 |
| commit | 0c2d823a7955981e88f7cb5b718a7081d97104f0 (patch) | |
| tree | 25269036f634b5127f7579e8e14ce6961ebbebc2 /Src/Zle/zle_main.c | |
| parent | 54678f2e82908e930fcc0b32369dbff0bff3abed (diff) | |
| download | zsh-0c2d823a7955981e88f7cb5b718a7081d97104f0.tar.gz zsh-0c2d823a7955981e88f7cb5b718a7081d97104f0.zip | |
37337: Delay freeing widget until not in use.
Diffstat (limited to 'Src/Zle/zle_main.c')
| -rw-r--r-- | Src/Zle/zle_main.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 38427e8e3..1f0c07df4 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1344,6 +1344,8 @@ execzlefunc(Thingy func, char **args, int set_bindk) eofsent = 1; ret = 1; } else { + int inuse = wflags & WIDGET_INUSE; + w->flags |= WIDGET_INUSE; if(!(wflags & ZLE_KEEPSUFFIX)) removesuffix(); if(!(wflags & ZLE_MENUCMP)) { @@ -1367,6 +1369,12 @@ execzlefunc(Thingy func, char **args, int set_bindk) ret = w->u.fn(args); unqueue_signals(); } + if (!inuse) { + if (w->flags & WIDGET_FREE) + freewidget(w); + else + w->flags &= ~WIDGET_INUSE; + } if (!(wflags & ZLE_NOTCOMMAND)) lastcmd = wflags; } @@ -1387,6 +1395,8 @@ execzlefunc(Thingy func, char **args, int set_bindk) int osc = sfcontext, osi = movefd(0); int oxt = isset(XTRACE); LinkList largs = NULL; + int inuse = w->flags & WIDGET_INUSE; + w->flags |= WIDGET_INUSE; if (*args) { largs = newlinklist(); @@ -1402,8 +1412,15 @@ execzlefunc(Thingy func, char **args, int set_bindk) opts[XTRACE] = oxt; sfcontext = osc; endparamscope(); - lastcmd = w->flags; - w->flags = 0; + lastcmd = w->flags & ~(WIDGET_INUSE|WIDGET_FREE); + if (inuse) { + w->flags &= WIDGET_INUSE|WIDGET_FREE; + } else { + if (w->flags & WIDGET_FREE) + freewidget(w); + else + w->flags = 0; + } r = 1; redup(osi, 0); } |