summaryrefslogtreecommitdiff
path: root/Src/hist.c
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2015-09-11 21:51:49 +0200
committerAxel Beckert <abe@deuxchevaux.org>2015-09-11 21:51:49 +0200
commit7534dfa8848251305ad2914c338f232050f6a500 (patch)
treee693cdc8e3eaa157574c10de89a94a3547faa78e /Src/hist.c
parent63deeaba7e4ae09b81d933985152c4240ae08d25 (diff)
parent68405f31a043bdd5bf338eb06688ed3e1f740937 (diff)
downloadzsh-7534dfa8848251305ad2914c338f232050f6a500.tar.gz
zsh-7534dfa8848251305ad2914c338f232050f6a500.zip
Merge tag 'zsh-5.1.1' into debian
Diffstat (limited to 'Src/hist.c')
-rw-r--r--Src/hist.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Src/hist.c b/Src/hist.c
index 75e809c48..9c42d85c9 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -390,6 +390,12 @@ ihgetc(void)
{
int c = ingetc();
+ if (exit_pending)
+ {
+ lexstop = 1;
+ errflag |= ERRFLAG_ERROR;
+ return ' ';
+ }
qbang = 0;
if (!stophist && !(inbufflags & INP_ALIAS)) {
/* If necessary, expand history characters. */