diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-14 13:10:03 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-14 13:10:03 +0000 |
| commit | bf990125d18effbf111fd6a30ff5bf90c4c263ae (patch) | |
| tree | a46a769858edf3186616e1ce5a3a5e0c2e374de1 | |
| parent | 719acaf241ed24c2f18a5ac750cb0beb87c3acc1 (diff) | |
| download | zsh-bf990125d18effbf111fd6a30ff5bf90c4c263ae.tar.gz zsh-bf990125d18effbf111fd6a30ff5bf90c4c263ae.tar.xz zsh-bf990125d18effbf111fd6a30ff5bf90c4c263ae.zip | |
zsh-workers/9722
| -rw-r--r-- | Completion/Commands/_expand_word | 2 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 6 | ||||
| -rw-r--r-- | Src/Zle/complist.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Completion/Commands/_expand_word b/Completion/Commands/_expand_word index ad334da9d..2e31b6ebc 100644 --- a/Completion/Commands/_expand_word +++ b/Completion/Commands/_expand_word @@ -8,7 +8,7 @@ local curcontext="$curcontext" if [[ -z "$curcontext" ]]; then - curcontext="correct-word:::" + curcontext="expand-word:::" else curcontext="expand-word:${curcontext#*:}" fi 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); } |