diff options
| author | Frank Terbeck <ft@bewatermyfriend.org> | 2011-06-02 10:50:35 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2011-06-02 10:50:35 +0200 |
| commit | 2438a0e95aa448f0aeda468752444306b44fe7d0 (patch) | |
| tree | 8477e9c6af360f6a89af13e8cb5f2a4f9c1cff2c /Src/Zle/zle_main.c | |
| parent | b495ba1e5a3ab1396844490ad8cad17dec23d6c1 (diff) | |
| parent | 21266db1d9ae433bf1dcb196a4e258c00541b599 (diff) | |
| download | zsh-2438a0e95aa448f0aeda468752444306b44fe7d0.tar.gz zsh-2438a0e95aa448f0aeda468752444306b44fe7d0.zip | |
Merge commit 'zsh-4.3.12' into debian
Diffstat (limited to 'Src/Zle/zle_main.c')
| -rw-r--r-- | Src/Zle/zle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |