mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-03 22:32:12 +02:00
fix for _path_files and globcomplete, better test if word contains wildcards (11776)
This commit is contained in:
parent
4900804b61
commit
24559bb1f6
2 changed files with 6 additions and 2 deletions
|
@ -1,5 +1,8 @@
|
|||
2000-06-06 Sven Wischnowsky <wischnow@zsh.org>
|
||||
|
||||
* 11776: Completion/Core/_path_files: fix for _path_files and
|
||||
globcomplete, better test if word contains wildcards
|
||||
|
||||
* 11768: Doc/Zsh/expn.yo, Src/lex.c, Src/subst.c: make (e) flag be
|
||||
silent unless (X) is given, too
|
||||
|
||||
|
|
|
@ -184,7 +184,7 @@ eorig="$orig"
|
|||
|
||||
[[ $compstate[insert] = (*menu|[0-9]*) || -n "$_comp_correct" ||
|
||||
( -n "$compstate[pattern_match]" &&
|
||||
"${orig#\~}" != "${${orig#\~}:q}" ) ]] && menu=yes
|
||||
"${orig#\~}" != (|*[^\\])[][*?#~^\|\<\>]* ) ]] && menu=yes
|
||||
|
||||
# Now let's have a closer look at the string to complete.
|
||||
|
||||
|
@ -491,7 +491,8 @@ for prepath in "$prepaths[@]"; do
|
|||
fi
|
||||
|
||||
if (( tmp4 )) ||
|
||||
[[ -n "$compstate[pattern_match]" && "$tmp2" != "${(q)tmp2}" ]]; then
|
||||
[[ -n "$compstate[pattern_match]" &&
|
||||
"$tmp2" = (|*[^\\])[][*?#~^\|\<\>]* ]]; then
|
||||
# It is. For menucompletion we now add the possible completions
|
||||
# for this component with the unambigous prefix we have built
|
||||
# and the rest of the string from the line as the suffix.
|
||||
|
|
Loading…
Reference in a new issue