mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-01 21:51:40 +02:00
don't forget a displayed list when starting menu completion (12884)
This commit is contained in:
parent
bca563a699
commit
213a453d08
2 changed files with 9 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
2000-10-04 Sven Wischnowsky <wischnow@zsh.org>
|
||||
|
||||
* 12884: Src/Zle/compcore.c: don't forget a displayed list when
|
||||
starting menu completion
|
||||
|
||||
2000-10-04 Tanaka Akira <akr@zsh.org>
|
||||
|
||||
* 12872: Completion/User/_cvs: Fix modules completion when a cvsroot
|
||||
|
|
|
@ -282,7 +282,7 @@ int lastend;
|
|||
int
|
||||
do_completion(Hookdef dummy, Compldat dat)
|
||||
{
|
||||
int ret = 0, lst = dat->lst, incmd = dat->incmd;
|
||||
int ret = 0, lst = dat->lst, incmd = dat->incmd, osl = showinglist;
|
||||
char *s = dat->s;
|
||||
char *opm;
|
||||
LinkNode n;
|
||||
|
@ -412,6 +412,9 @@ do_completion(Hookdef dummy, Compldat dat)
|
|||
if (nmatches > 1 && diffmatches) {
|
||||
/* There is more than one match. */
|
||||
ret = do_ambiguous();
|
||||
|
||||
if (!showinglist && uselist && listshown && (usemenu == 2 || oldlist))
|
||||
showinglist = osl;
|
||||
} else if (nmatches == 1 || (nmatches > 1 && !diffmatches)) {
|
||||
/* Only one match. */
|
||||
Cmgroup m = amatches;
|
||||
|
|
Loading…
Reference in a new issue