diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-09-10 09:10:08 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-09-10 09:10:08 -0700 |
| commit | 3bca11c35cf9185c28a9b01e866bc5c7b1a96bfd (patch) | |
| tree | bf3a2c5a3b1f55e725d0dc97399ef9ed68f6b782 | |
| parent | 86229fdf09e2c69576000b0f83edb35148096452 (diff) | |
| download | zsh-3bca11c35cf9185c28a9b01e866bc5c7b1a96bfd.tar.gz zsh-3bca11c35cf9185c28a9b01e866bc5c7b1a96bfd.tar.xz zsh-3bca11c35cf9185c28a9b01e866bc5c7b1a96bfd.zip | |
36470: Auxiliary to 36468, return an empty buffer from zleread() if a widget exits
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index bf7f27edf..448bbb4f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-09-10 Barton E. Schaefer <schaefer@zsh.org> + + * 36470: Src/Zle/zle_main.c: Auxiliary to 36468, return an empty + buffer from zleread() if a widget exits + 2015-09-10 Peter Stephenson <p.stephenson@samsung.com> * 36468: Src/hist.c: Infinite loop if we tried to exit from a diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index e610ae1f3..ec3d2c354 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1276,7 +1276,7 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish) alarm(0); freeundo(); - if (eofsent || errflag) { + if (eofsent || errflag || exit_pending) { s = NULL; } else { zleline[zlell++] = ZWC('\n'); |