diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-15 09:07:09 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-15 09:07:09 +0000 |
| commit | e6cc1ece7fed93fd31ca4e7f7726de034ede887c (patch) | |
| tree | 93087d3edf5eb27836ba9bbdfb687b416fb7c629 /Completion/Core/_path_files | |
| parent | bf990125d18effbf111fd6a30ff5bf90c4c263ae (diff) | |
| download | zsh-e6cc1ece7fed93fd31ca4e7f7726de034ede887c.tar.gz zsh-e6cc1ece7fed93fd31ca4e7f7726de034ede887c.tar.xz zsh-e6cc1ece7fed93fd31ca4e7f7726de034ede887c.zip | |
zsh-workers/9731
Diffstat (limited to 'Completion/Core/_path_files')
| -rw-r--r-- | Completion/Core/_path_files | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files index 07e75052f..62c52e3c4 100644 --- a/Completion/Core/_path_files +++ b/Completion/Core/_path_files @@ -290,7 +290,7 @@ for prepath in "$prepaths[@]"; do tmp2=( "$tmp1[@]" ) builtin compadd -D tmp1 -F _comp_ignore "$matcher[@]" - "${(@)tmp1:t}" - if [[ $#tmp1 -eq 0 && -n "$_comp_correct" ]]; then + if [[ $#tmp1 -eq 0 ]]; then tmp1=( "$tmp2[@]" ) compadd -D tmp1 -F _comp_ignore "$matcher[@]" - "${(@)tmp2:t}" fi @@ -334,7 +334,7 @@ for prepath in "$prepaths[@]"; do if [[ -z "$tpre$tsuf" && -n "$pre$suf" ]]; then pfxsfx=(-S '' "$pfxsfx[@]") - break; + break elif [[ "$haspats" = no && -z "$tpre$tsuf" && "$pre" = */ && -z "$suf" ]]; then PREFIX="${opre}" @@ -352,8 +352,8 @@ for prepath in "$prepaths[@]"; do if [[ "$rem" = *parent* ]]; then for i in ${(M)^tmp1:#*/*}(-/); do remt="${${i#$prepath$realpath$donepath}%/*}" - while [[ "$remt" = */* ]]; do - [[ "$prepath$realpath$donepath$remt" -ef "$i" ]] && break + while [[ "$remt" = */* && + ! "$prepath$realpath$donepath$remt" -ef "$i" ]]; do remt="${remt%/*}" done [[ "$remt" = */* || "$remt" -ef "$i" ]] && @@ -406,9 +406,7 @@ for prepath in "$prepaths[@]"; do if [[ "$tmp3" = */* ]]; then tmp4=( "${(@M)tmp1:#${tmp3%%/*}/*}" ) - if (( $#tmp4 )); then - tmp1=( "$tmp4[@]" ) - fi + (( $#tmp4 )) && tmp1=( "$tmp4[@]" ) fi # Next we see if this component is ambiguous. |