about summary refs log tree commit diff
path: root/Src/parse.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2015-04-17 10:23:58 +0100
committerPeter Stephenson <pws@zsh.org>2015-04-17 10:23:58 +0100
commit4508d25710de08793005923b1f91f5ae072f3945 (patch)
treea7000951ba4226ecc1078408db3d04d0f35e72bc /Src/parse.c
parentccb1cf2d10aa674caf2aa73599110aed1127ad26 (diff)
downloadzsh-4508d25710de08793005923b1f91f5ae072f3945.tar.gz
zsh-4508d25710de08793005923b1f91f5ae072f3945.tar.xz
zsh-4508d25710de08793005923b1f91f5ae072f3945.zip
34905: no parse error after keyboard interrupt.
Handled generally, though only showing up in special nested
cases.

Also fix ZLE so it doesn't cancel the interrupt flag when
not actually returning from a local keymap.
Diffstat (limited to 'Src/parse.c')
-rw-r--r--Src/parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Src/parse.c b/Src/parse.c
index 0b54a904d..91a81e1ff 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -2419,7 +2419,7 @@ yyerror(int noerr)
     for (t0 = 0; t0 != 20; t0++)
 	if (!t || !t[t0] || t[t0] == '\n')
 	    break;
-    if (!(histdone & HISTFLAG_NOEXEC)) {
+    if (!(histdone & HISTFLAG_NOEXEC) && !(errflag & ERRFLAG_INT)) {
 	if (t0 == 20)
 	    zwarn("parse error near `%l...'", t, 20);
 	else if (t0)