From bf990125d18effbf111fd6a30ff5bf90c4c263ae Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Mon, 14 Feb 2000 13:10:03 +0000 Subject: zsh-workers/9722 --- Src/Zle/compcore.c | 6 +++--- Src/Zle/complist.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Src/Zle') diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index e9046177e..feadfa3b1 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -295,10 +295,10 @@ do_completion(Hookdef dummy, Compldat dat) haspattern = 0; complistmax = getiparam("LISTMAX"); zsfree(complastprompt); - complastprompt = ztrdup((dolastprompt = - ((isset(ALWAYSLASTPROMPT) && zmult == 1) || - (unset(ALWAYSLASTPROMPT) && zmult != 1))) ? + complastprompt = ztrdup(((isset(ALWAYSLASTPROMPT) && zmult == 1) || + (unset(ALWAYSLASTPROMPT) && zmult != 1)) ? "yes" : ""); + dolastprompt = 1; zsfree(complist); complist = ztrdup(isset(LISTROWSFIRST) ? (isset(LISTPACKED) ? "packed rows" : "rows") : diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index c62d62e1d..d19d5e80c 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -780,7 +780,7 @@ complistmatches(Hookdef dummy, Chdata dat) if (inselect) clearflag = 0; - if (asklist()) { + if (asklist() || !clearflag) { amatches = oamatches; return (noselect = 1); } -- cgit 1.4.1