mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-21 00:01:26 +01:00
Code Releases Activity

29444: when _path_files is called with a pattern to match directories, do

Browse source 
not descend into subdirectories for fake-files unless some are defined
This commit is contained in:
Bart Schaefer 2011-06-05 16:47:44 +00:00
parent c0d2cb5d02
commit 7598220496
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -3,6 +3,13 @@
* unposted: Functions/Zle/move-line-in-buffer: clean
the funny characters out of move-line-in-buffer.
2011-06-04 Barton E. Schaefer <schaefer@zsh.org>
* 29444: Completion/Unix/Type/_path_files: when called with a
pattern to match directories, as from _files with list-dirs-first,
do not descend into subdirectories looking for fake files unless
some fake files have been defined.
2011-06-04 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Completion/Zsh/Context/_brace_parameter, Src/Zle/compcore.c
@ -14963,5 +14970,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5363 $
* $Revision: 1.5364 $
*****************************************************

2
Completion/Unix/Type/_path_files
View file

@ -438,7 +438,7 @@ for prepath in "$prepaths[@]"; do
tmp2=( "$tmp1[@]" )
if [[ "$tpre$tsuf" = */* ]]; then
if [[ "$tpre$tsuf" = (#b)*/(*) && -n "$fake${match[1]}" ]]; then
compfiles -P$cfopt tmp1 accex "$skipped" "$_matcher $matcher[2]" "$sdirs" fake
elif [[ "$sopt" = *[/f]* ]]; then
compfiles -p$cfopt tmp1 accex "$skipped" "$_matcher $matcher[2]" "$sdirs" fake "$pats[@]"