mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-03 10:21:46 +02:00
zsh-workers/9722
This commit is contained in:
parent
719acaf241
commit
bf990125d1
3 changed files with 5 additions and 5 deletions
|
@ -8,7 +8,7 @@
|
||||||
local curcontext="$curcontext"
|
local curcontext="$curcontext"
|
||||||
|
|
||||||
if [[ -z "$curcontext" ]]; then
|
if [[ -z "$curcontext" ]]; then
|
||||||
curcontext="correct-word:::"
|
curcontext="expand-word:::"
|
||||||
else
|
else
|
||||||
curcontext="expand-word:${curcontext#*:}"
|
curcontext="expand-word:${curcontext#*:}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -295,10 +295,10 @@ do_completion(Hookdef dummy, Compldat dat)
|
||||||
haspattern = 0;
|
haspattern = 0;
|
||||||
complistmax = getiparam("LISTMAX");
|
complistmax = getiparam("LISTMAX");
|
||||||
zsfree(complastprompt);
|
zsfree(complastprompt);
|
||||||
complastprompt = ztrdup((dolastprompt =
|
complastprompt = ztrdup(((isset(ALWAYSLASTPROMPT) && zmult == 1) ||
|
||||||
((isset(ALWAYSLASTPROMPT) && zmult == 1) ||
|
(unset(ALWAYSLASTPROMPT) && zmult != 1)) ?
|
||||||
(unset(ALWAYSLASTPROMPT) && zmult != 1))) ?
|
|
||||||
"yes" : "");
|
"yes" : "");
|
||||||
|
dolastprompt = 1;
|
||||||
zsfree(complist);
|
zsfree(complist);
|
||||||
complist = ztrdup(isset(LISTROWSFIRST) ?
|
complist = ztrdup(isset(LISTROWSFIRST) ?
|
||||||
(isset(LISTPACKED) ? "packed rows" : "rows") :
|
(isset(LISTPACKED) ? "packed rows" : "rows") :
|
||||||
|
|
|
@ -780,7 +780,7 @@ complistmatches(Hookdef dummy, Chdata dat)
|
||||||
if (inselect)
|
if (inselect)
|
||||||
clearflag = 0;
|
clearflag = 0;
|
||||||
|
|
||||||
if (asklist()) {
|
if (asklist() || !clearflag) {
|
||||||
amatches = oamatches;
|
amatches = oamatches;
|
||||||
return (noselect = 1);
|
return (noselect = 1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue