From 78c410f9c48e497cdbe1586b5709a41a7f912dee Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Mon, 20 Jun 2016 23:53:13 +0200 Subject: [PATCH] zsh: backport patch zsh/37643 Fixes the disappearance of the prompt when cancelling menu-based tab completion. --- srcpkgs/zsh/patches/37643.patch | 29 +++++++++++++++++++++++++++++ srcpkgs/zsh/template | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/zsh/patches/37643.patch diff --git a/srcpkgs/zsh/patches/37643.patch b/srcpkgs/zsh/patches/37643.patch new file mode 100644 index 00000000000..a6f1d555e1c --- /dev/null +++ b/srcpkgs/zsh/patches/37643.patch @@ -0,0 +1,29 @@ +commit 1d8b5285226afba4f1ef9030cf862c14b975c284 +Author: Peter Stephenson +Date: Fri Jan 15 12:49:42 2016 +0000 + + 37643: Reset interrupt on key input in menu selection. + + We don't need to propagate the interrupt further as the interrupt + causes the key to be empty, which will exit the widget. We + need to reset the condition as zrefresh() is now more sensitive + to errors since 36416 / 32f5d3d8. + +diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c +index 29aaee8..0ccb885 100644 +--- Src/Zle/complist.c ++++ 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; + diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template index 05afba40e04..40fc4d365c4 100644 --- a/srcpkgs/zsh/template +++ b/srcpkgs/zsh/template @@ -1,7 +1,7 @@ # Template file for 'zsh' pkgname=zsh version=5.2 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure make_build_target="all info"