diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-04-17 17:36:55 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-04-17 17:37:26 +0100 |
| commit | de22f2bfa64e341f99c37f44e52bb1bbed730169 (patch) | |
| tree | 88975b8584cb0d0e163162c781248841ee8660e4 | |
| parent | 156327023ceb1ba9290cd7fc087d39a9868fddc4 (diff) | |
| download | zsh-de22f2bfa64e341f99c37f44e52bb1bbed730169.tar.gz zsh-de22f2bfa64e341f99c37f44e52bb1bbed730169.zip | |
34919: update interrupt parse error for ZLE cases.
Covers both send-break and push-input.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/zle_hist.c | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_misc.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -5,6 +5,9 @@ 2015-04-17 Peter Stephenson <p.stephenson@samsung.com> + * 34919: Src/Zle/zle_hist.c, Src/Zle/zle_misc.c: similar cases + with send-break and push-input. + * 34905: Src/Zle/zle_keymap.c, Src/lex.c, Src/parse.c: suppress parse errors resulting from keyboard interruption. diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c index 88623bb3c..cc66f99ae 100644 --- a/Src/Zle/zle_hist.c +++ b/Src/Zle/zle_hist.c @@ -854,7 +854,7 @@ pushlineoredit(char **args) } ret = pushline(args); if (!isfirstln) { - errflag |= ERRFLAG_ERROR; + errflag |= ERRFLAG_ERROR|ERRFLAG_INT; done = 1; } clearlist = 1; diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c index 23286fc20..4669ef2ad 100644 --- a/Src/Zle/zle_misc.c +++ b/Src/Zle/zle_misc.c @@ -1041,7 +1041,7 @@ copyprevshellword(UNUSED(char **args)) int sendbreak(UNUSED(char **args)) { - errflag |= ERRFLAG_ERROR; + errflag |= ERRFLAG_ERROR|ERRFLAG_INT; return 1; } |