mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-01-01 17:24:50 +01:00
zsh-workers/9886
This commit is contained in:
parent
96d9ceba2b
commit
057736f440
1 changed files with 6 additions and 6 deletions
|
@ -458,26 +458,26 @@ for prepath in "$prepaths[@]"; do
|
||||||
if [[ "$tmp3" = */* ]]; then
|
if [[ "$tmp3" = */* ]]; then
|
||||||
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" -s "/${tmp3#*/}" \
|
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" -s "/${tmp3#*/}" \
|
||||||
-W "$prepath$realpath$testpath" \
|
-W "$prepath$realpath$testpath" \
|
||||||
"$pfxsfx[@]" -M "r:|/=* r:|=*" \
|
"$pfxsfx[@]" "$matcher[@]" "r:|/=* r:|=*" \
|
||||||
- "${(@)tmp1%%/*}"
|
- "${(@)tmp1%%/*}"
|
||||||
else
|
else
|
||||||
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
|
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
|
||||||
-W "$prepath$realpath$testpath" \
|
-W "$prepath$realpath$testpath" \
|
||||||
"$pfxsfx[@]" -M "r:|/=* r:|=*" \
|
"$pfxsfx[@]" "$matcher[@]" "r:|/=* r:|=*" \
|
||||||
- "$tmp1[@]"
|
- "$tmp1[@]"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [[ "$tmp3" = */* ]]; then
|
if [[ "$tmp3" = */* ]]; then
|
||||||
atmp=( -Qf "$mopts[@]" -p "$linepath$tmp2"
|
atmp=( -Qf "$mopts[@]" -p "$linepath$tmp2"
|
||||||
-W "$prepath$realpath$testpath"
|
-W "$prepath$realpath$testpath"
|
||||||
"$pfxsfx[@]" -M "r:|/=* r:|=*" )
|
"$pfxsfx[@]" "$matcher[@]" "r:|/=* r:|=*" )
|
||||||
for i in "$tmp1[@]"; do
|
for i in "$tmp1[@]"; do
|
||||||
compadd "$atmp[@]" -s "/${i#*/}" - "${i%%/*}"
|
compadd "$atmp[@]" -s "/${i#*/}" - "${i%%/*}"
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
|
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
|
||||||
-W "$prepath$realpath$testpath" \
|
-W "$prepath$realpath$testpath" \
|
||||||
"$pfxsfx[@]" -M "r:|/=* r:|=*" \
|
"$pfxsfx[@]" "$matcher[@]" "r:|/=* r:|=*" \
|
||||||
- "$tmp1[@]"
|
- "$tmp1[@]"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -525,7 +525,7 @@ for prepath in "$prepaths[@]"; do
|
||||||
tmp4="$testpath"
|
tmp4="$testpath"
|
||||||
compquote tmp4 tmp1
|
compquote tmp4 tmp1
|
||||||
compadd -Qf "$mopts[@]" -p "$linepath$tmp4" -W "$prepath$realpath$testpath" \
|
compadd -Qf "$mopts[@]" -p "$linepath$tmp4" -W "$prepath$realpath$testpath" \
|
||||||
"$pfxsfx[@]" -M "r:|/=* r:|=*" - "$tmp1[@]"
|
"$pfxsfx[@]" "$matcher[@]" "r:|/=* r:|=*" - "$tmp1[@]"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -541,7 +541,7 @@ if zstyle -t ":completion:${curcontext}:paths" expand prefix &&
|
||||||
if (( $#exppaths )); then
|
if (( $#exppaths )); then
|
||||||
PREFIX="${opre}"
|
PREFIX="${opre}"
|
||||||
SUFFIX="${osuf}"
|
SUFFIX="${osuf}"
|
||||||
compadd -Q "$mopts[@]" -S '' -M "r:|/=* r:|=*" -p "$linepath" - "$exppaths[@]"
|
compadd -Q "$mopts[@]" -S '' "$matcher[@]" "r:|/=* r:|=*" -p "$linepath" - "$exppaths[@]"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue