diff options
Diffstat (limited to 'Completion/User')
| -rw-r--r-- | Completion/User/_cvs | 3 | ||||
| -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 | 3 | ||||
| -rw-r--r-- | Completion/User/_urls | 5 | ||||
| -rw-r--r-- | Completion/User/_users | 2 |
7 files changed, 11 insertions, 8 deletions
diff --git a/Completion/User/_cvs b/Completion/User/_cvs index 484d5c88c..fc0ab3116 100644 --- a/Completion/User/_cvs +++ b/Completion/User/_cvs @@ -488,7 +488,8 @@ _cvs_extract_file_entries () { (( $+functions[_cvs_extract_modifiedfile_entries] )) || _cvs_extract_modifiedfile_entries () { - if _style cvs disable-stat || ! { zmodload -e stat || zmodload stat }; then + if zstyle -t ":completion${curcontext}:cvs" disable-stat || + ! { zmodload -e stat || zmodload stat }; then _cvs_extract_file_entries return fi diff --git a/Completion/User/_groups b/Completion/User/_groups index 0007c1791..fbd884688 100644 --- a/Completion/User/_groups +++ b/Completion/User/_groups @@ -4,7 +4,7 @@ local expl groups _wanted groups expl group || return 1 -if ! _style -a 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 196f40c83..9de9b2d96 100644 --- a/Completion/User/_hosts +++ b/Completion/User/_hosts @@ -2,7 +2,7 @@ local expl hosts -if ! _style -a 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 db4ea03c8..07428fe75 100644 --- a/Completion/User/_ports +++ b/Completion/User/_ports @@ -2,7 +2,7 @@ local expl ports -if ! _style -a 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 7a7c7dccc..d6a8b7af7 100644 --- a/Completion/User/_socket +++ b/Completion/User/_socket @@ -9,7 +9,8 @@ local curcontext="$curcontext" state line expl typeset -A opt_args [[ $CURRENT -eq 2 ]] && _wanted options expl option && - { ! _style options prefix-needed || [[ "$PREFIX" = -* ]] } && + { ! zstyle -t ":completion${curcontext}:options" prefix-needed || + [[ "$PREFIX" = -* ]] } && compadd -M 'r:|[_-]=* r:|=*' "$expl[@]" - -version _arguments -C -s \ diff --git a/Completion/User/_urls b/Completion/User/_urls index 265fadae8..84244cce0 100644 --- a/Completion/User/_urls +++ b/Completion/User/_urls @@ -40,8 +40,9 @@ local ipre scheme host user uhosts ret=1 expl local urls_path localhttp -_style -s urls path urls_path || urls_path="${ZDOTDIR:-$HOME}/.zsh/urls" -_style -a urls local localhttp +zstyle -s ":completion${curcontext}:urls" path urls_path || + urls_path="${ZDOTDIR:-$HOME}/.zsh/urls" +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 8ddfd8cd7..45ed0f89d 100644 --- a/Completion/User/_users +++ b/Completion/User/_users @@ -7,7 +7,7 @@ local expl users _wanted users expl user || return 1 -_style -a users users users && +zstyle -a ":completion${curcontext}:users" users users && compadd "$expl[@]" "$@" - "$users[@]" && return 0 compadd "$@" "$expl[@]" - "${(@k)userdirs}" |