mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

fix for special-dirs when used with -g patterns (11570)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-05-25 12:01:37 +00:00
parent c99a94e365
commit 105456d250
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2000-05-25 Sven Wischnowsky <wischnow@zsh.org>
* 11570: Completion/Core/_path_files: fix for special-dirs when
used with -g patterns
* 11569: Src/Zle/complist.c: better cursor-movement in
menu-selection

14
Completion/Core/_path_files
View file

@ -142,6 +142,9 @@ fi
zstyle -s ":completion:${curcontext}:paths" special-dirs sdirs &&
[[ "$sdirs" = (yes|true|on|1) ]] && sdirs=yes
[[ "$pats" = ((|*[[:blank:]])\*(|[[:blank:]]*)|*\([^[:blank:]]#/[^[:blank:]]#\)*) ]] &&
sopt=$sopt/
zstyle -s ":completion:${curcontext}:files" ignore-parents ignpar
# We get the prefix and the suffix from the line and save the whole
@ -293,9 +296,9 @@ for prepath in "$prepaths[@]"; do
fi
if [[ -n "$sdirs" && ( -o globdots || "$PREFIX" = .* ) ]]; then
if [[ "$sdirs" = yes ]]; then
tmp1=( "$tmp1[@]" . .. )
tmp1=( "$tmp1[@]" $^tmp2${skipped}{.,..} )
elif [[ "$sdirs" = .. ]]; then
tmp1=( "$tmp1[@]" .. )
tmp1=( "$tmp1[@]" $^tmp2${skipped}.. )
fi
fi
else
@ -304,13 +307,12 @@ for prepath in "$prepaths[@]"; do
else
tmp1=( ${^tmp1}${skipped}${^~pats} )
fi
if [[ -n "$sdirs" &&
( "$sopt" = *[/f]* || "$pats" = *\([^[:blank:]]#/[^[:blank:]]#\)* ) &&
if [[ -n "$sdirs" && "$sopt" = *[/f]* &&
( -o globdots || "$PREFIX" = .* ) ]]; then
if [[ "$sdirs" = yes ]]; then
tmp1=( "$tmp1[@]" . .. )
tmp1=( "$tmp1[@]" $^tmp2${skipped}{.,..} )
elif [[ "$sdirs" = .. ]]; then
tmp1=( "$tmp1[@]" .. )
tmp1=( "$tmp1[@]" $^tmp2${skipped}.. )
fi
fi
fi