diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Core/_multi_parts | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2001-03-28 Sven Wischnowsky <wischnow@zsh.org> + + * 13813: Completion/Core/_multi_parts: make sure _multi_parts + doesn't add the empty string as a possible completion + 2001-03-28 Peter Stephenson <pws@csr.com> * unposted: Completion/Commands/_complete_tag: mysterious extra diff --git a/Completion/Core/_multi_parts b/Completion/Core/_multi_parts index fe1406832..cf6d6dbac 100644 --- a/Completion/Core/_multi_parts +++ b/Completion/Core/_multi_parts @@ -163,14 +163,14 @@ while true; do compadd "$group[@]" "$expl[@]" -r "$sep" -S "$sep" "$opts[@]" \ -p "$pref" "$tmp2[@]" -M "r:|${sep}=* r:|=* $matcher" - \ - "${(@)${(@M)matches:#*${sep}}%%${sep}*}" && ret=0 + "${(@)${(@)${(@M)matches:#*${sep}}%%${sep}*}:#}" && ret=0 (( $matches[(I)${sep}*] )) && compadd "$group[@]" "$expl[@]" -S '' "$opts[@]" \ -p "$pref" \ -M "r:|${sep}=* r:|=* $matcher" - "$sep" && ret=0 compadd "$group[@]" "$expl[@]" -r "$sep" -S "$sep" "$opts[@]" \ -p "$pref" "$tmp2[@]" -M "r:|${sep}=* r:|=* $matcher" - \ - "${(@)${(@M)matches:#*?${sep}?*}%%${sep}*}" && ret=0 + "${(@)${(@)${(@M)matches:#*?${sep}?*}%%${sep}*}:#}" && ret=0 compadd "$group[@]" "$expl[@]" -S '' "$opts[@]" -p "$pref" "$tmp2[@]" \ -M "r:|${sep}=* r:|=* $matcher" - \ "${(@)matches:#*${sep}*}" && ret=0 @@ -182,7 +182,7 @@ while true; do compadd "$group[@]" "$expl[@]" "$opts[@]" \ -p "$pref" -s "${i#*${sep}}" \ -M "r:|${sep}=* r:|=* $matcher" - \ - "${(@)${(@M)matches:#*${sep}*}%%${sep}*}" && ret=0 + "${(@)${(@)${(@M)matches:#*${sep}*}%%${sep}*}:#}" && ret=0 compadd "$group[@]" "$expl[@]" -S '' "$opts[@]" -p "$pref" \ -M "r:|${sep}=* r:|=* $matcher" - \ "${(@)matches:#*${sep}*}" && ret=0 |