mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-24 21:11:03 +02:00
Code

28186: replace (...|...) pattern-match with a loop over the alternatives to

Browse Source 
avoid issues with pattern-quoting each alternative.
This commit is contained in:
Bart Schaefer 2010-08-22 15:54:36 +00:00
parent a7551af424
commit 059c8dede6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
2010-08-22 Barton E. Schaefer <schaefer@zsh.org>
* 28186: Completion/Base/Utility/_multi_parts: replace a single
(...|...) pattern-match with a loop over the alternatives to
avoid issues with pattern-quoting each alternative.
2010-08-21 Frank Terbeck <ft@bewatermyfriend.org>
* Mikael Magnusson: 28181: Doc/Zsh/mod_zprof.yo: Remove a
@ -13544,5 +13550,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5060 $
* $Revision: 1.5061 $
*****************************************************

9
Completion/Base/Utility/_multi_parts
View File

@ -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