mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

don't forget a displayed list when starting menu completion (12884)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-10-04 13:24:45 +00:00
parent bca563a699
commit 213a453d08
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2000-10-04 Tanaka Akira <akr@zsh.org>
* 12872: Completion/User/_cvs: Fix modules completion when a cvsroot * 12872: Completion/User/_cvs: Fix modules completion when a cvsroot

5
Src/Zle/compcore.c
View file

@ -282,7 +282,7 @@ int lastend;
int int
do_completion(Hookdef dummy, Compldat dat) 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 *s = dat->s;
char *opm; char *opm;
LinkNode n; LinkNode n;
@ -412,6 +412,9 @@ do_completion(Hookdef dummy, Compldat dat)
if (nmatches > 1 && diffmatches) { if (nmatches > 1 && diffmatches) {
/* There is more than one match. */ /* There is more than one match. */
ret = do_ambiguous(); ret = do_ambiguous();
if (!showinglist && uselist && listshown && (usemenu == 2 || oldlist))
showinglist = osl;
} else if (nmatches == 1 || (nmatches > 1 && !diffmatches)) { } else if (nmatches == 1 || (nmatches > 1 && !diffmatches)) {
/* Only one match. */ /* Only one match. */
Cmgroup m = amatches; Cmgroup m = amatches;