mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-05 11:01:13 +02:00
Code Releases Activity

36146: avoid mix of -/ and -g with _files as that just overrides user preferences

Browse source
This commit is contained in:
Oliver Kiddle 2015-08-14 11:00:39 +02:00
parent 5f8a18a561
commit 9a4e1bf93b
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2015-08-14 Oliver Kiddle <opk@zsh.org>
* 36146: Completion/Zsh/Type/_command_names,
Completion/Zsh/Command/_zmodload: avoid mix of -/ and -g with
_files as that just overrides user preferences
2015-08-13 Daniel Shahaf <d.s@daniel.shahaf.name> 2015-08-13 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Completion/Unix/Command/_subversion: _subversion: * unposted: Completion/Unix/Command/_subversion: _subversion:

2
Completion/Zsh/Command/_zmodload
View file

@ -68,7 +68,7 @@ else
_requested loadedmodules expl 'loaded modules' \ _requested loadedmodules expl 'loaded modules' \
compadd -k 'modules[(R)loaded]' && ret=0 compadd -k 'modules[(R)loaded]' && ret=0
_requested files expl 'module file' \ _requested files expl 'module file' \
_files -W module_path -/g '*.(dll|s[ol]|bundle)(:r)' && ret=0 _files -W module_path -g '*.(dll|s[ol]|bundle)(:r)' && ret=0
_requested aliases expl 'module alias' \ _requested aliases expl 'module alias' \
compadd "$suf[@]" -k 'modules[(R)alias*]' && ret=0 compadd "$suf[@]" -k 'modules[(R)alias*]' && ret=0
done done

4
Completion/Zsh/Type/_command_names
View file

@ -17,9 +17,7 @@ defs=(
) )
[[ -n "$path[(r).]" || $PREFIX = */* ]] && [[ -n "$path[(r).]" || $PREFIX = */* ]] &&
defs=( "$defs[@]" defs+=( 'executables:executable file:_files -g \*\(-\*\)' )
'executables:executable file or directory:_path_files -/g \*\(-\*\)'
)
if [[ "$1" = -e ]]; then if [[ "$1" = -e ]]; then
shift shift