diff options
Diffstat (limited to 'Completion/User')
-rw-r--r-- | Completion/User/_cvs | 4 | ||||
-rw-r--r-- | Completion/User/_domains | 2 | ||||
-rw-r--r-- | Completion/User/_groups | 2 | ||||
-rw-r--r-- | Completion/User/_hosts | 2 | ||||
-rw-r--r-- | Completion/User/_ports | 2 | ||||
-rw-r--r-- | Completion/User/_socket | 2 | ||||
-rw-r--r-- | Completion/User/_urls | 4 | ||||
-rw-r--r-- | Completion/User/_users | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/Completion/User/_cvs b/Completion/User/_cvs index 1a1a40b0f..15eb6b872 100644 --- a/Completion/User/_cvs +++ b/Completion/User/_cvs @@ -40,7 +40,7 @@ _cvs_command () { cmd="${${(k)cmds[(R)* $words[1] *]}:-${(k)cmds[(i)$words[1]]}}" if (( $#cmd )); then - curcontext="${curcontext%:*}:$cmd" + curcontext="${curcontext%:*:*}:cvs-${cmd}:" _cvs_$cmd else _message "unknown cvs command: $words[1]" @@ -390,7 +390,7 @@ _cvs_watchers () { (( $+functions[_cvs_loadstat] )) || _cvs_loadstat () { - zstyle -t ":completion${curcontext}:cvs" disable-stat && return + zstyle -t ":completion:${curcontext}:" disable-stat && return (( $+_cvs_loadstat_tried )) && return _cvs_loadstat_tried=yes diff --git a/Completion/User/_domains b/Completion/User/_domains index a27f6f34a..cf7e9befe 100644 --- a/Completion/User/_domains +++ b/Completion/User/_domains @@ -2,7 +2,7 @@ local expl domains tmp -if ! zstyle -a ":completion${curcontext}:domains" domains domains; then +if ! zstyle -a ":completion:${curcontext}:domains" domains domains; then if (( ! $+_cache_domains )); then _cache_domains=() if [[ -f /etc/resolv.conf ]]; then diff --git a/Completion/User/_groups b/Completion/User/_groups index fbd884688..051bb829a 100644 --- a/Completion/User/_groups +++ b/Completion/User/_groups @@ -4,7 +4,7 @@ local expl groups _wanted groups expl group || return 1 -if ! zstyle -a ":completion${curcontext}:groups" groups groups; then +if ! zstyle -a ":completion:${curcontext}:groups" groups groups; then (( $+_cache_groups )) || if (( ${+commands[ypcat]} )); then : ${(A)_cache_groups:=${${(s: :)$(ypcat group.byname)}%%:*}} # If you use YP diff --git a/Completion/User/_hosts b/Completion/User/_hosts index 6078514b6..cab65329c 100644 --- a/Completion/User/_hosts +++ b/Completion/User/_hosts @@ -2,7 +2,7 @@ local expl hosts -if ! zstyle -a ":completion${curcontext}:hosts" hosts hosts; then +if ! zstyle -a ":completion:${curcontext}:hosts" hosts hosts; then (( $+_cache_hosts )) || : ${(A)_cache_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} diff --git a/Completion/User/_ports b/Completion/User/_ports index 07428fe75..8cf90a913 100644 --- a/Completion/User/_ports +++ b/Completion/User/_ports @@ -2,7 +2,7 @@ local expl ports -if ! zstyle -a ":completion${curcontext}:ports" ports ports; then +if ! zstyle -a ":completion:${curcontext}:ports" ports ports; then (( $+_cache_ports )) || : ${(A)_cache_ports:=${${(M)${${(f)"$(</etc/services)"}:#\#*}#*/tcp}%%[ ]*}} diff --git a/Completion/User/_socket b/Completion/User/_socket index d6a8b7af7..bb9ee2a67 100644 --- a/Completion/User/_socket +++ b/Completion/User/_socket @@ -9,7 +9,7 @@ local curcontext="$curcontext" state line expl typeset -A opt_args [[ $CURRENT -eq 2 ]] && _wanted options expl option && - { ! zstyle -t ":completion${curcontext}:options" prefix-needed || + { ! zstyle -t ":completion:${curcontext}:options" prefix-needed || [[ "$PREFIX" = -* ]] } && compadd -M 'r:|[_-]=* r:|=*' "$expl[@]" - -version diff --git a/Completion/User/_urls b/Completion/User/_urls index d8a6f06f5..3f2cab789 100644 --- a/Completion/User/_urls +++ b/Completion/User/_urls @@ -40,9 +40,9 @@ local ipre scheme host user uhosts ret=1 expl local urls_path localhttp -zstyle -s ":completion${curcontext}:urls" path urls_path || +zstyle -s ":completion:${curcontext}:urls" path urls_path || urls_path="${ZDOTDIR:-$HOME}/.zsh/urls" -zstyle -a ":completion${curcontext}:urls" local localhttp +zstyle -a ":completion:${curcontext}:urls" local localhttp local localhttp_servername="$localhttp[1]" local localhttp_documentroot="$localhttp[2]" local localhttp_userdir="$localhttp[3]" diff --git a/Completion/User/_users b/Completion/User/_users index 45ed0f89d..1df724208 100644 --- a/Completion/User/_users +++ b/Completion/User/_users @@ -7,7 +7,7 @@ local expl users _wanted users expl user || return 1 -zstyle -a ":completion${curcontext}:users" users users && +zstyle -a ":completion:${curcontext}:users" users users && compadd "$expl[@]" "$@" - "$users[@]" && return 0 compadd "$@" "$expl[@]" - "${(@k)userdirs}" |