diff options
| -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
diff --git a/ChangeLog b/ChangeLog index 3d07270c4..9eff8fbb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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; } |