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

29374: exit ZLE immediately if exit pending when keypress expected

Browse source
This commit is contained in:
Peter Stephenson 2011-05-26 09:19:11 +00:00
parent 671479ded1
commit 54acd80359
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

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

4
Src/Zle/zle_main.c
View file

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