mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-10-02 08:51:18 +02:00
Code

fix for menu-completion when another completion came right after it (11836)

Browse Source
This commit is contained in:
Sven Wischnowsky 2000-06-09 11:14:34 +00:00
parent 427b4b74f2
commit 4997db3470
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-06-09 Sven Wischnowsky <wischnow@zsh.org> 2000-06-09 Sven Wischnowsky <wischnow@zsh.org>
* 11836: Src/Zle/compcore.c, Src/Zle/complist.c: fix for
menu-completion when another completion came right after it
* 11833: Completion/Core/_path_files, Src/Zle/computil.c: improve * 11833: Completion/Core/_path_files, Src/Zle/computil.c: improve
_path_files, move some code into C, try to optimise glob patterns _path_files, move some code into C, try to optimise glob patterns
and immediately accept exact directory matches and immediately accept exact directory matches

1
Src/Zle/compcore.c
View File

@ -512,6 +512,7 @@ after_complete(Hookdef dummy, int *dat)
if ((ret = runhookdef(MENUSTARTHOOK, (void *) &cdat))) { if ((ret = runhookdef(MENUSTARTHOOK, (void *) &cdat))) {
dat[1] = 0; dat[1] = 0;
menucmp = menuacc = 0; menucmp = menuacc = 0;
minfo.cur = NULL;
if (ret == 2) { if (ret == 2) {
fixsuffix(); fixsuffix();
cs = 0; cs = 0;

1
Src/Zle/complist.c
View File

@ -1778,6 +1778,7 @@ domenuselect(Hookdef dummy, Chdata dat)
s->origcs = origcs; s->origcs = origcs;
s->origll = origll; s->origll = origll;
menucmp = menuacc = hasoldlist = 0; menucmp = menuacc = hasoldlist = 0;
minfo.cur = NULL;
fixsuffix(); fixsuffix();
validlist = 0; validlist = 0;
amatches = pmatches = lastmatches = NULL; amatches = pmatches = lastmatches = NULL;