diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2011-05-26 09:19:11 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2011-05-26 09:19:11 +0000 |
| commit | 54acd80359d2512644398a53e60a5e8b6b2841cb (patch) | |
| tree | 8517d925b5d3a8140b4e9d53841e26cc04fb3df4 | |
| parent | 671479ded18b52a0e8e9abe6a10f07adbf7001c5 (diff) | |
| download | zsh-54acd80359d2512644398a53e60a5e8b6b2841cb.tar.gz zsh-54acd80359d2512644398a53e60a5e8b6b2841cb.tar.xz zsh-54acd80359d2512644398a53e60a5e8b6b2841cb.zip | |
29374: exit ZLE immediately if exit pending when keypress expected
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e1693eef8..7d8a9aa02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-26 Peter Stephenson <pws@csr.com> + + * 29374: Src/Zle/zle_main.c: Exit ZLE immediately if exit + is pending when a keypress is expected. + 2011-05-25 Peter Stephenson <p.w.stephenson@ntlworld.com> * Bernhard Tittelbach: 29371: Completion/Unix/Command/_initctl: @@ -14820,5 +14825,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5329 $ +* $Revision: 1.5330 $ ***************************************************** diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 0ac45431d..6acedee70 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -633,7 +633,7 @@ raw_getbyte(long do_keytmout, char *cptr) /* * Make sure a user interrupt gets passed on straight away. */ - if (selret < 0 && errflag) + if (selret < 0 && (errflag || retflag || breaks || exit_pending)) break; /* * Try to avoid errors on our special fd's from @@ -875,7 +875,7 @@ getbyte(long do_keytmout, int *timeout) icnt = 0; if (errno == EINTR) { die = 0; - if (!errflag && !retflag && !breaks) + if (!errflag && !retflag && !breaks && !exit_pending) continue; errflag = 0; breaks = obreaks; |