diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-09-11 21:51:49 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-09-11 21:51:49 +0200 |
| commit | 7534dfa8848251305ad2914c338f232050f6a500 (patch) | |
| tree | e693cdc8e3eaa157574c10de89a94a3547faa78e /Src/Zle/zle_main.c | |
| parent | 63deeaba7e4ae09b81d933985152c4240ae08d25 (diff) | |
| parent | 68405f31a043bdd5bf338eb06688ed3e1f740937 (diff) | |
| download | zsh-7534dfa8848251305ad2914c338f232050f6a500.tar.gz zsh-7534dfa8848251305ad2914c338f232050f6a500.zip | |
Merge tag 'zsh-5.1.1' into debian
Diffstat (limited to 'Src/Zle/zle_main.c')
| -rw-r--r-- | Src/Zle/zle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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'); |