From 059c8dede666e4b7698f141687e67441c469541e Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Sun, 22 Aug 2010 15:54:36 +0000 Subject: 28186: replace (...|...) pattern-match with a loop over the alternatives to avoid issues with pattern-quoting each alternative. --- Completion/Base/Utility/_multi_parts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Completion') diff --git a/Completion/Base/Utility/_multi_parts b/Completion/Base/Utility/_multi_parts index 6fb6cbdb1..3e2f36c9c 100644 --- a/Completion/Base/Utility/_multi_parts +++ b/Completion/Base/Utility/_multi_parts @@ -127,7 +127,8 @@ while true; do return fi elif (( $#tmp1 )); then - local ret=1 + local ret=1 tt + local -a mm # More than one match. First we get all strings that match the # rest from the line. @@ -144,7 +145,11 @@ while true; do SUFFIX="$suf" fi - matches=( "${(@M)matches:#(${(j:|:)~${(q)tmp1}})*}" ) + for tt in $tmp1 + do + mm+=( "${(@M)matches:#$tt*}" ) + done + matches=( $mm ) if ! zstyle -t ":completion:${curcontext}:" expand suffix || [[ -n "$menu" || -z "$compstate[insert]" ]]; then -- cgit 1.4.1