diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-02-09 14:01:57 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-02-09 14:01:57 +0000 |
| commit | 006e966e435e9c0b54e356fcb66a0447c8dd570c (patch) | |
| tree | 5118f0501f93ab8ded2e3baea6ffe4e1067075c7 | |
| parent | 5723d260c0928b85989bfde7b48f26acf2d9f8c5 (diff) | |
| download | zsh-006e966e435e9c0b54e356fcb66a0447c8dd570c.tar.gz zsh-006e966e435e9c0b54e356fcb66a0447c8dd570c.tar.xz zsh-006e966e435e9c0b54e356fcb66a0447c8dd570c.zip | |
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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Completion/Core/_multi_parts | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 63336337f..2046d45c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> * 13448: Completion/User/.distfiles, Completion/User/_tin, diff --git a/Completion/Core/_multi_parts b/Completion/Core/_multi_parts index b59550a7f..fe1406832 100644 --- a/Completion/Core/_multi_parts +++ b/Completion/Core/_multi_parts @@ -113,7 +113,7 @@ while true; do if [[ $#imm -ne 0 && $#matches -eq 1 ]] || zstyle -t ":completion:${curcontext}:" expand suffix; then - compadd "$group[@]" "$expl[@]" "$opts[@]" \ + compadd "$group[@]" "$expl[@]" "$sopts[@]" \ -M "r:|${sep}=* r:|=* $matcher" - "$pref$matches[1]" else if (( $matches[(I)${tmp1[1]}${sep}*] )); then @@ -235,7 +235,7 @@ while true; do SUFFIX="" if [[ -n "$pref" && "$orig" != "$pref" ]]; then - if [[ "$pref" = *${sep} ]]; then + if [[ "$pref" = *${sep}*${sep} ]]; then compadd "$group[@]" "$expl[@]" "$opts[@]" \ -p "${pref%${sep}*${sep}}${sep}" -S "$sep" \ -M "r:|${sep}=* r:|=* $matcher" - "${${pref%${sep}}##*${sep}}" |