diff options
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/_command_names | 2 | ||||
| -rw-r--r-- | Completion/Builtins/_aliases | 2 | ||||
| -rw-r--r-- | Completion/Builtins/_enable | 8 | ||||
| -rw-r--r-- | Completion/Builtins/_unhash | 5 | ||||
| -rw-r--r-- | Completion/Builtins/_which | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/Completion/Base/_command_names b/Completion/Base/_command_names index 5ec984bdc..889b330bd 100644 --- a/Completion/Base/_command_names +++ b/Completion/Base/_command_names @@ -28,7 +28,7 @@ if [[ -z "$ext" ]]; then _description expl 'shell function' compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0 _description expl 'alias' - compadd "$expl[@]" "$@" - "${(k@)raliases}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)aliases}" && ret=0 _description expl 'reserved word' compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0 fi diff --git a/Completion/Builtins/_aliases b/Completion/Builtins/_aliases index 5f2a8ec84..8764f7f66 100644 --- a/Completion/Builtins/_aliases +++ b/Completion/Builtins/_aliases @@ -3,6 +3,6 @@ local expl _description expl 'regular alias' -compadd "$expl[@]" - "${(@k)raliases}" +compadd "$expl[@]" - "${(@k)aliases}" _description expl 'global alias' compadd "$expl[@]" - "${(@k)galiases}" diff --git a/Completion/Builtins/_enable b/Completion/Builtins/_enable index 07077abd6..7d15e9121 100644 --- a/Completion/Builtins/_enable +++ b/Completion/Builtins/_enable @@ -4,19 +4,19 @@ local prev="$words[CURRENT-1]" ret=1 expl if [[ "$prev" = -*a* ]]; then _description expl alias - compadd "$expl[@]" "$@" - "${(k@)disaliases}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)dis_aliases}" "${(k@)dis_galiases}" && ret=0 fi if [[ "$prev" = -*f* ]]; then _description expl 'shell function' - compadd "$expl[@]" "$@" - "${(k@)disfunctions}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)dis_functions}" && ret=0 fi if [[ "$prev" = -*r* ]]; then _description expl 'reserved word' - compadd "$expl[@]" "$@" - "${(k@)disreswords}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)dis_reswords}" && ret=0 fi if [[ "$prev" != -* ]]; then _description expl 'builtin command' - compadd "$expl[@]" "$@" - "${(k@)disbuiltins}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)dis_builtins}" && ret=0 fi return ret diff --git a/Completion/Builtins/_unhash b/Completion/Builtins/_unhash index 1209f68af..a23fd9025 100644 --- a/Completion/Builtins/_unhash +++ b/Completion/Builtins/_unhash @@ -8,11 +8,12 @@ if [[ "$fl" = -*d* ]]; then fi if [[ "$fl" = -*a* ]]; then _description expl alias - compadd "$expl[@]" - "${(@k)aliases}" "${(@k)disaliases}" && ret=0 + compadd "$expl[@]" - "${(@k)aliases}" "${(@k)dis_aliases}" \ + "${(@k)galiases}" "${(@k)dis_galiases}" && ret=0 fi if [[ "$fl" = -*f* ]]; then _description expl 'shell function' - compadd "$expl[@]" - "${(@k)functions}" "${(@k)disfunctions}" && ret=0 + compadd "$expl[@]" - "${(@k)functions}" "${(@k)dis_functions}" && ret=0 fi if [[ "$fl" != -* ]]; then _command_names -e && ret=0 diff --git a/Completion/Builtins/_which b/Completion/Builtins/_which index 328f7730c..41e7d20fd 100644 --- a/Completion/Builtins/_which +++ b/Completion/Builtins/_which @@ -9,6 +9,6 @@ compadd "$expl[@]" "$@" - "${(k@)builtins}" && ret=0 _description expl 'shell function' compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0 _description expl 'alias' -compadd "$expl[@]" "$@" - "${(k@)raliases}" && ret=0 +compadd "$expl[@]" "$@" - "${(k@)aliases}" && ret=0 _description expl 'reserved word' compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0 |