1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-19 03:31:14 +02:00

two small fixes to _multi_parts; one more place where a caller-supplied -S can be used and fix for the code deciding which prefix to use (13450)

This commit is contained in:
Sven Wischnowsky 2001-02-09 14:01:57 +00:00
parent 5723d260c0
commit 006e966e43
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2001-02-09 Sven Wischnowsky <wischnow@zsh.org>
* 13450: Completion/Core/_multi_parts: two small fixes to
_multi_parts; one more place where a caller-supplied -S can be
used and fix for the code deciding which prefix to use
2001-02-08 Oliver Kiddle <opk@zsh.org> 2001-02-08 Oliver Kiddle <opk@zsh.org>
* 13448: Completion/User/.distfiles, Completion/User/_tin, * 13448: Completion/User/.distfiles, Completion/User/_tin,

View file

@ -113,7 +113,7 @@ while true; do
if [[ $#imm -ne 0 && $#matches -eq 1 ]] || if [[ $#imm -ne 0 && $#matches -eq 1 ]] ||
zstyle -t ":completion:${curcontext}:" expand suffix; then zstyle -t ":completion:${curcontext}:" expand suffix; then
compadd "$group[@]" "$expl[@]" "$opts[@]" \ compadd "$group[@]" "$expl[@]" "$sopts[@]" \
-M "r:|${sep}=* r:|=* $matcher" - "$pref$matches[1]" -M "r:|${sep}=* r:|=* $matcher" - "$pref$matches[1]"
else else
if (( $matches[(I)${tmp1[1]}${sep}*] )); then if (( $matches[(I)${tmp1[1]}${sep}*] )); then
@ -235,7 +235,7 @@ while true; do
SUFFIX="" SUFFIX=""
if [[ -n "$pref" && "$orig" != "$pref" ]]; then if [[ -n "$pref" && "$orig" != "$pref" ]]; then
if [[ "$pref" = *${sep} ]]; then if [[ "$pref" = *${sep}*${sep} ]]; then
compadd "$group[@]" "$expl[@]" "$opts[@]" \ compadd "$group[@]" "$expl[@]" "$opts[@]" \
-p "${pref%${sep}*${sep}}${sep}" -S "$sep" \ -p "${pref%${sep}*${sep}}${sep}" -S "$sep" \
-M "r:|${sep}=* r:|=* $matcher" - "${${pref%${sep}}##*${sep}}" -M "r:|${sep}=* r:|=* $matcher" - "${${pref%${sep}}##*${sep}}"