From 8066c8066520d734d22ab17992bd3787777d4130 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Thu, 28 Oct 1999 08:13:52 +0000 Subject: zsh-workers/8471 --- Completion/Base/_command_names | 8 ++++---- Completion/Base/_equal | 2 +- Completion/Builtins/_aliases | 4 ++-- Completion/Builtins/_bindkey | 4 ++-- Completion/Builtins/_builtin | 2 +- Completion/Builtins/_disable | 8 ++++---- Completion/Builtins/_enable | 8 ++++---- Completion/Builtins/_functions | 2 +- Completion/Builtins/_unhash | 4 ++-- Completion/Builtins/_which | 8 ++++---- Completion/Builtins/_zle | 4 ++-- Completion/Builtins/_zmodload | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'Completion') diff --git a/Completion/Base/_command_names b/Completion/Base/_command_names index 79bd46e84..a640e196b 100644 --- a/Completion/Base/_command_names +++ b/Completion/Base/_command_names @@ -24,13 +24,13 @@ compadd "$expl[@]" "$@" - "${(k@)commands}" && ret=0 if [[ -z "$ext" ]]; then _description expl 'builtin command' - compadd "$expl[@]" "$@" - "${(k@)builtins[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)builtins}" && ret=0 _description expl 'shell function' - compadd "$expl[@]" "$@" - "${(k@)functions[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0 _description expl 'alias' - compadd "$expl[@]" "$@" - "${(k@)raliases[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)raliases}" && ret=0 _description expl 'reserved word' - compadd "$expl[@]" "$@" - "${(k@)reswords[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0 fi if [[ nm -eq compstate[nmatches] ]]; then diff --git a/Completion/Base/_equal b/Completion/Base/_equal index 1ba92cdc6..c50741ed4 100644 --- a/Completion/Base/_equal +++ b/Completion/Base/_equal @@ -3,6 +3,6 @@ local expl _description expl alias -compadd "$@" "$expl[@]" - "${(@k)aliases[(R)^?disabled*]}" +compadd "$@" "$expl[@]" - "${(@k)aliases}" _description expl command compadd "$@" "$expl[@]" - "${(k@)commands}" diff --git a/Completion/Builtins/_aliases b/Completion/Builtins/_aliases index 0189d6cf3..5f2a8ec84 100644 --- a/Completion/Builtins/_aliases +++ b/Completion/Builtins/_aliases @@ -3,6 +3,6 @@ local expl _description expl 'regular alias' -compadd "$expl[@]" - "${(@k)raliases[(R)^?disabled*]}" +compadd "$expl[@]" - "${(@k)raliases}" _description expl 'global alias' -compadd "$expl[@]" - "${(@k)galiases[(R)^?disabled*]}" +compadd "$expl[@]" - "${(@k)galiases}" diff --git a/Completion/Builtins/_bindkey b/Completion/Builtins/_bindkey index 3f964e704..b60dafbb2 100644 --- a/Completion/Builtins/_bindkey +++ b/Completion/Builtins/_bindkey @@ -11,8 +11,8 @@ local expl if [[ "$words[2]" = -*[DAN]* || "$words[CURRENT-1]" = -*M ]]; then _description expl keymap - compadd "$expl[@]" - "$zlekeymaps[@]" + compadd "$expl[@]" - "$keymaps[@]" else _description expl widget - compadd "$expl[@]" -M 'r:|-=* r:|=*' - "${(@k)zlewidgets}" + compadd "$expl[@]" -M 'r:|-=* r:|=*' - "${(@k)widgets}" fi diff --git a/Completion/Builtins/_builtin b/Completion/Builtins/_builtin index 06ef1c246..cf02093bb 100644 --- a/Completion/Builtins/_builtin +++ b/Completion/Builtins/_builtin @@ -8,5 +8,5 @@ else local expl _description expl 'builtin command' - compadd "$expl[@]" "$@" - "${(k@)builtins[(R)^?disabled*]}" + compadd "$expl[@]" "$@" - "${(k@)builtins}" fi diff --git a/Completion/Builtins/_disable b/Completion/Builtins/_disable index fe6b991b2..af4805c25 100644 --- a/Completion/Builtins/_disable +++ b/Completion/Builtins/_disable @@ -4,19 +4,19 @@ local prev="$words[CURRENT-1]" ret=1 expl if [[ "$prev" = -*a* ]]; then _description expl alias - compadd "$expl[@]" "$@" - "${(k@)aliases[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)aliases}" && ret=0 fi if [[ "$prev" = -*f* ]]; then _description expl 'shell function' - compadd "$expl[@]" "$@" - "${(k@)functions[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0 fi if [[ "$prev" = -*r* ]]; then _description expl 'reserved word' - compadd "$expl[@]" "$@" - "${(k@)reswords[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0 fi if [[ "$prev" != -* ]]; then _description expl 'builtin command' - compadd "$expl[@]" "$@" - "${(k@)builtins[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)builtins}" && ret=0 fi return ret diff --git a/Completion/Builtins/_enable b/Completion/Builtins/_enable index b4f0356bc..07077abd6 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@)aliases[(R)?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)disaliases}" && ret=0 fi if [[ "$prev" = -*f* ]]; then _description expl 'shell function' - compadd "$expl[@]" "$@" - "${(k@)functions[(R)?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)disfunctions}" && ret=0 fi if [[ "$prev" = -*r* ]]; then _description expl 'reserved word' - compadd "$expl[@]" "$@" - "${(k@)reswords[(R)?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)disreswords}" && ret=0 fi if [[ "$prev" != -* ]]; then _description expl 'builtin command' - compadd "$expl[@]" "$@" - "${(k@)builtins[(R)?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)disbuiltins}" && ret=0 fi return ret diff --git a/Completion/Builtins/_functions b/Completion/Builtins/_functions index d5f32d2e3..81a56eb83 100644 --- a/Completion/Builtins/_functions +++ b/Completion/Builtins/_functions @@ -3,4 +3,4 @@ local expl _description expl 'shell function' -compadd "$expl[@]" "$@" - "${(k@)functions[(R)^?disabled*]}" +compadd "$expl[@]" "$@" - "${(k@)functions}" diff --git a/Completion/Builtins/_unhash b/Completion/Builtins/_unhash index dfebd5399..1209f68af 100644 --- a/Completion/Builtins/_unhash +++ b/Completion/Builtins/_unhash @@ -8,11 +8,11 @@ if [[ "$fl" = -*d* ]]; then fi if [[ "$fl" = -*a* ]]; then _description expl alias - compadd "$expl[@]" - "${(@k)aliases}" && ret=0 + compadd "$expl[@]" - "${(@k)aliases}" "${(@k)disaliases}" && ret=0 fi if [[ "$fl" = -*f* ]]; then _description expl 'shell function' - compadd "$expl[@]" - "${(@k)functions}" && ret=0 + compadd "$expl[@]" - "${(@k)functions}" "${(@k)disfunctions}" && ret=0 fi if [[ "$fl" != -* ]]; then _command_names -e && ret=0 diff --git a/Completion/Builtins/_which b/Completion/Builtins/_which index 30d20ab36..328f7730c 100644 --- a/Completion/Builtins/_which +++ b/Completion/Builtins/_which @@ -5,10 +5,10 @@ local expl _description expl 'external command' compadd "$expl[@]" "$@" - "${(k@)commands}" && ret=0 _description expl 'builtin command' -compadd "$expl[@]" "$@" - "${(k@)builtins[(R)^?disabled*]}" && ret=0 +compadd "$expl[@]" "$@" - "${(k@)builtins}" && ret=0 _description expl 'shell function' -compadd "$expl[@]" "$@" - "${(k@)functions[(R)^?disabled*]}" && ret=0 +compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0 _description expl 'alias' -compadd "$expl[@]" "$@" - "${(k@)raliases[(R)^?disabled*]}" && ret=0 +compadd "$expl[@]" "$@" - "${(k@)raliases}" && ret=0 _description expl 'reserved word' -compadd "$expl[@]" "$@" - "${(k@)reswords[(R)^?disabled*]}" && ret=0 +compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0 diff --git a/Completion/Builtins/_zle b/Completion/Builtins/_zle index 327d67c62..a153aabdd 100644 --- a/Completion/Builtins/_zle +++ b/Completion/Builtins/_zle @@ -4,8 +4,8 @@ local expl if [[ "$words[2]" = -N && CURRENT -eq 3 ]]; then _description expl 'widget shell function' - compadd "$expl[@]" "$@" - "${(k@)functions[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0 else _description expl widget - compadd "$expl[@]" - "${(@k)zlewidgets}" + compadd "$expl[@]" - "${(@k)widgets}" fi diff --git a/Completion/Builtins/_zmodload b/Completion/Builtins/_zmodload index a0d5987c4..097911307 100644 --- a/Completion/Builtins/_zmodload +++ b/Completion/Builtins/_zmodload @@ -4,7 +4,7 @@ local fl="$words[2]" expl if [[ "$fl" = -*(a*u|u*a)* || "$fl" = -*a* && CURRENT -ge 4 ]]; then _description expl 'builtin command' - compadd "$expl[@]" "$@" - "${(k@)builtins[(R)^?disabled*]}" && ret=0 + compadd "$expl[@]" "$@" - "${(k@)builtins}" && ret=0 elif [[ "$fl" = -*u* ]]; then _description expl module compadd "$expl[@]" - "${(@k)modules}" -- cgit 1.4.1