From 54acd80359d2512644398a53e60a5e8b6b2841cb Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 26 May 2011 09:19:11 +0000 Subject: 29374: exit ZLE immediately if exit pending when keypress expected --- Src/Zle/zle_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Src/Zle') 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; -- cgit 1.4.1