mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2026-01-07 10:01:37 +01:00
Code Releases Activity

26606: fix doubled -s in path completion in some cases

Browse source
This commit is contained in:
Peter Stephenson 2009-02-25 20:51:12 +00:00
parent 3b88638729
commit 5375b71009
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2009-02-25 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 26606: Completion/Unix/Type/_path_files: fix doubled -s
in path completion in certain cases.
2009-02-25 Peter Stephenson <pws@csr.com>
* Src/hist.c: 26602: history substitution buffer could overflow
@ -11237,5 +11242,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4579 $
* $Revision: 1.4580 $
*****************************************************

3
Completion/Unix/Type/_path_files
View file

@ -666,14 +666,13 @@ for prepath in "$prepaths[@]"; do
# We are inserting the match into the command line.
if [[ "$tmp3" = */* ]]; then
tmp4=( $Uopt -Qf "$mopts[@]" -p "${Uopt:+$IPREFIX}$linepath$tmp2"
-s "${Uopt:+$ISUFFIX}"
-W "$prepath$realpath$testpath"
"$pfxsfx[@]" $Mopts )
if [[ -z "$listsfx" ]]; then
for i in "$tmp1[@]"; do
tmpdisp=("${i%%/*}")
_list_files tmpdisp "$prepath$realpath$testpath"
compadd "$tmp4[@]" -s "/${i#*/}" $listopts - "$tmpdisp"
compadd "$tmp4[@]" -s "/${i#*/}${Uopt:+$ISUFFIX}" $listopts - "$tmpdisp"
done
else
[[ -n "$compstate[pattern_match]" ]] && SUFFIX="${SUFFIX:s./.*/}*"