diff options
| author | Oliver Kiddle <opk@zsh.org> | 2015-08-14 11:00:39 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2015-08-14 11:00:39 +0200 |
| commit | 9a4e1bf93b0bd60b39bb59fb9bc603cfe891b2d1 (patch) | |
| tree | 18a2a1ced4b19d4b8b53a924a9fd311e11e2ae0a | |
| parent | 5f8a18a561ef83857b2cafdc6eaa19bad254fe89 (diff) | |
| download | zsh-9a4e1bf93b0bd60b39bb59fb9bc603cfe891b2d1.tar.gz zsh-9a4e1bf93b0bd60b39bb59fb9bc603cfe891b2d1.zip | |
36146: avoid mix of -/ and -g with _files as that just overrides user preferences
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_zmodload | 2 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_command_names | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -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> * unposted: Completion/Unix/Command/_subversion: _subversion: diff --git a/Completion/Zsh/Command/_zmodload b/Completion/Zsh/Command/_zmodload index e144b981e..57fb990e9 100644 --- a/Completion/Zsh/Command/_zmodload +++ b/Completion/Zsh/Command/_zmodload @@ -68,7 +68,7 @@ else _requested loadedmodules expl 'loaded modules' \ compadd -k 'modules[(R)loaded]' && ret=0 _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' \ compadd "$suf[@]" -k 'modules[(R)alias*]' && ret=0 done diff --git a/Completion/Zsh/Type/_command_names b/Completion/Zsh/Type/_command_names index d9fc62dfe..940f341cb 100644 --- a/Completion/Zsh/Type/_command_names +++ b/Completion/Zsh/Type/_command_names @@ -17,9 +17,7 @@ defs=( ) [[ -n "$path[(r).]" || $PREFIX = */* ]] && - defs=( "$defs[@]" - 'executables:executable file or directory:_path_files -/g \*\(-\*\)' - ) + defs+=( 'executables:executable file:_files -g \*\(-\*\)' ) if [[ "$1" = -e ]]; then shift |