diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-09 11:14:34 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-09 11:14:34 +0000 |
| commit | 4997db3470da7dd8b538b6e8df953c309c1fdda6 (patch) | |
| tree | 72b551f6bf3a942882ff5b82d8f4c3142e8b8de9 | |
| parent | 427b4b74f24757eef749bd4c7b22f8398f47261f (diff) | |
| download | zsh-4997db3470da7dd8b538b6e8df953c309c1fdda6.tar.gz zsh-4997db3470da7dd8b538b6e8df953c309c1fdda6.tar.xz zsh-4997db3470da7dd8b538b6e8df953c309c1fdda6.zip | |
fix for menu-completion when another completion came right after it (11836)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 1 | ||||
| -rw-r--r-- | Src/Zle/complist.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 17ef304a6..6d5f55d8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 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 _path_files, move some code into C, try to optimise glob patterns and immediately accept exact directory matches diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index ad048718d..7497d03b4 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -512,6 +512,7 @@ after_complete(Hookdef dummy, int *dat) if ((ret = runhookdef(MENUSTARTHOOK, (void *) &cdat))) { dat[1] = 0; menucmp = menuacc = 0; + minfo.cur = NULL; if (ret == 2) { fixsuffix(); cs = 0; diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 622219aaf..cbc39266f 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1778,6 +1778,7 @@ domenuselect(Hookdef dummy, Chdata dat) s->origcs = origcs; s->origll = origll; menucmp = menuacc = hasoldlist = 0; + minfo.cur = NULL; fixsuffix(); validlist = 0; amatches = pmatches = lastmatches = NULL; |