about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2001-05-31 07:17:03 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2001-05-31 07:17:03 +0000
commit1a55d536211ed8b6a811f0220e7923586d71f58b (patch)
treeab8622f888264aa0a3daefe172d58feee38695cf
parent99beeb572efa528d2eef31b8cb64e54a1effeaa7 (diff)
downloadzsh-1a55d536211ed8b6a811f0220e7923586d71f58b.tar.gz
zsh-1a55d536211ed8b6a811f0220e7923586d71f58b.tar.xz
zsh-1a55d536211ed8b6a811f0220e7923586d71f58b.zip
always use supplied matchers (14599)
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Base/Utility/_multi_parts4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 76d675124..0b9c13e9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-31  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 14599: Completion/Base/Utility/_multi_parts: always use
+	supplied matchers
+
 2001-05-30  Peter Stephenson  <pws@csr.com>
 
 	* 14573: INSTALL, README, Doc/Zsh/builtins.yo, Test/README,
diff --git a/Completion/Base/Utility/_multi_parts b/Completion/Base/Utility/_multi_parts
index 2c9f7fb01..93f2bbd56 100644
--- a/Completion/Base/Utility/_multi_parts
+++ b/Completion/Base/Utility/_multi_parts
@@ -91,10 +91,10 @@ while true; do
   else
     # No exact match, see how many strings match what's on the line.
 
-    builtin compadd -O tmp1 - "${(@)${(@)matches%%${sep}*}:#}"
+    builtin compadd -O tmp1 -M "r:|${sep}=* r:|=* $matcher" - "${(@)${(@)matches%%${sep}*}:#}"
 
     [[ $#tmp1 -eq 0 && -n "$_comp_correct" ]] &&
-      compadd -O tmp1 - "${(@)${(@)matches%%${sep}*}:#}"
+      compadd -O tmp1 -M "r:|${sep}=* r:|=* $matcher" - "${(@)${(@)matches%%${sep}*}:#}"
 
     if [[ $#tmp1 -eq 1 ]]; then