summaryrefslogtreecommitdiff
path: root/Src/Zle/complist.c
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2016-01-24 17:19:53 +0100
committerAxel Beckert <abe@deuxchevaux.org>2016-01-24 17:19:53 +0100
commit86ca06fb4b5a835caac37700952207db4c5073cd (patch)
treec2686e6d126d59052310c6bb7cd8df6d76fa0fca /Src/Zle/complist.c
parent370659ae9ae918a07a7950bbc2827b2593126f7d (diff)
parentd18ce35d060163ea0d531170b65e1c38311af166 (diff)
downloadzsh-86ca06fb4b5a835caac37700952207db4c5073cd.tar.gz
zsh-86ca06fb4b5a835caac37700952207db4c5073cd.zip
Merge branch 'upstream' at 5.2-dev-1 into debian
Diffstat (limited to 'Src/Zle/complist.c')
-rw-r--r--Src/Zle/complist.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 29aaee82a..0ccb88505 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -2584,6 +2584,12 @@ domenuselect(Hookdef dummy, Chdata dat)
if (!do_last_key) {
zmult = 1;
cmd = getkeycmd();
+ /*
+ * On interrupt, we'll exit due to cmd being empty.
+ * Don't propagate the interrupt any further, which
+ * can screw up redrawing.
+ */
+ errflag &= ~ERRFLAG_INT;
if (mtab_been_reallocated) {
do_last_key = 1;
continue;