From fe51f39dadfc2a1651ac92edfb783f1e6100b7b1 Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Thu, 18 Dec 2014 03:49:51 +0900 Subject: 33978: avoid infinite loop in interactive mode Update command line when accept-and-hold is called in the interactive mode of menu select. --- ChangeLog | 5 +++++ Src/Zle/complist.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee3e8207a..1911ec9d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-12-18 Jun-ichi Takimoto + + * 33978: Src/Zle/complist.c: update command line when accept- + and-hold is called in interactive mode of menu select + 2014-12-17 Peter Stephenson * users/19551: Doc/builtins.yo, Doc/Zsh/roadmap.yo: better diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index c129940f7..b6e7e30e9 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -2790,7 +2790,9 @@ domenuselect(Hookdef dummy, Chdata dat) Menustack s = (Menustack) zhalloc(sizeof(*s)); int ol; - mode = 0; + if (mode == MM_INTER) + do_single(*minfo.cur); + mode = 0; s->prev = u; u = s; s->line = dupstring(zlemetaline); -- cgit 1.4.1