From d726746c3d16f7606d984c94ca1cc6b59d192d30 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Mon, 28 Feb 2000 10:00:25 +0000 Subject: manual/9897 --- Completion/Base/_arguments | 2 +- Completion/Builtins/_pids | 10 +++++----- Completion/Linux/_rpm | 4 ++-- Completion/User/_a2ps | 2 +- Completion/User/_archie | 2 +- Completion/User/_diff_options | 2 +- Completion/User/_finger | 2 +- Completion/User/_groups | 2 +- Completion/User/_gs | 2 +- Completion/User/_killall | 2 +- Completion/User/_lp | 2 +- Completion/User/_telnet | 2 +- Completion/User/_users_on | 2 +- Completion/User/_yp | 4 ++-- Completion/X/_x_font | 2 +- Completion/X/_x_window | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'Completion') diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index 50c368b11..472f085d5 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -67,7 +67,7 @@ if (( long )); then # those hyphens and anything from the space or comma after the # option up to the end. - lopts=("--${(@)^${(@)${(@)${(@M)${(@ps:\n:j:\n:)${(@)${(@M)${(@f)$(${~words[1]} --help 2>&1)//\[--/ + lopts=("--${(@)^${(@)${(@)${(@M)${(@ps:\n:j:\n:)${(@)${(@M)${(@f)$(_call options ${~words[1]} --help 2>&1)//\[--/ --}:#[ ]#-*}//,/ }}:#[ ]#--*}#*--}%%[], ]*}:#}") lopts=( "${(@)lopts:#--}" ) diff --git a/Completion/Builtins/_pids b/Completion/Builtins/_pids index d74cd9a56..92fc9bac7 100644 --- a/Completion/Builtins/_pids +++ b/Completion/Builtins/_pids @@ -12,17 +12,17 @@ if [[ "$1" = -m ]]; then shift 2 fi -zstyle -a ":completion:${curcontext}:ps" arguments args +zstyle -s ":completion:${curcontext}:pids" command args -out="$(command ps $args 2>/dev/null)" +out="$(_call pids ps 2>/dev/null)" if zstyle -T ":completion:${curcontext}:processes" verbose; then - zstyle -a ":completion:${curcontext}:ps" list-arguments listargs + zstyle -s ":completion:${curcontext}:pids-list" command listargs (( $#listargs )) || listargs=( "$args[@]" ) if [[ "$listargs" = "$args" ]]; then list=("${(@Mr:COLUMNS-1:)${(f@)out}[2,-1]:#[ ]#${PREFIX}[0-9]#${SUFFIX}[ ]*${~match}}") else - list=("${(@Mr:COLUMNS-1:)${(f@)$(command ps $listargs 2>/dev/null)}[2,-1]:#[ ]#${PREFIX}[0-9]#${SUFFIX}[ ]*${~match}}") + list=("${(@Mr:COLUMNS-1:)${(f@)$(_call pids-list ps 2>/dev/null)}[2,-1]:#[ ]#${PREFIX}[0-9]#${SUFFIX}[ ]*${~match}}") fi desc=(-ld list) else @@ -30,4 +30,4 @@ else fi compadd "$expl[@]" "$@" "$desc[@]" - \ - ${${${(M)${(f)"$(command ps $args 2>/dev/null)"}[2,-1]:#[ ]#${PREFIX}[0-9]#${SUFFIX}[ ]#*${~match}}## #}%% *} + ${${${(M)${(f)"${out}"}[2,-1]:#[ ]#${PREFIX}[0-9]#${SUFFIX}[ ]#*${~match}}## #}%% *} diff --git a/Completion/Linux/_rpm b/Completion/Linux/_rpm index a1bd5281b..d5978eb0b 100644 --- a/Completion/Linux/_rpm +++ b/Completion/Linux/_rpm @@ -190,7 +190,7 @@ while [[ -n "$state" ]]; do ;& package) _wanted packages expl 'RPM package' && - compadd "$expl[@]" -M 'r:|-=* r:|=*' - $(rpm -qa) && ret=0 + compadd "$expl[@]" -M 'r:|-=* r:|=*' - $(_call packages rpm -qa) && ret=0 ;; package_file) if compset -P ftp://; then @@ -205,7 +205,7 @@ while [[ -n "$state" ]]; do if compset -P '*\{'; then _wanted tags expl 'RPM tag' && compadd "$expl[@]" -M 'm:{a-z}={A-Z}' -S '\}' - \ - "${(@)${(@f)$(rpm --querytags)}#RPMTAG_}" && ret=0 + "${(@)${(@f)$(_call tags rpm --querytags)}#RPMTAG_}" && ret=0 else _message 'RPM format' fi diff --git a/Completion/User/_a2ps b/Completion/User/_a2ps index 5fbe1990b..d7c9b68e9 100644 --- a/Completion/User/_a2ps +++ b/Completion/User/_a2ps @@ -7,7 +7,7 @@ if [[ "$words[1]" != "$_a2ps_cache_cmd" ]]; then _a2ps_cache_cmd="$words[1]" - descr=( "${(@)${(f@)$(LC_ALL=C $words[1] --list=features)// + descr=( "${(@)${(f@)$(_call features LC_ALL=C $words[1] --list=features)// / }:#}" ) _a2ps_cache_values=( diff --git a/Completion/User/_archie b/Completion/User/_archie index e1c9156fa..57a5db494 100644 --- a/Completion/User/_archie +++ b/Completion/User/_archie @@ -24,7 +24,7 @@ _arguments -C -s \ case "$state" in serverhost) - : ${(A)archie_servers:=${(M)$(archie -L):#archie.*}} + : ${(A)archie_servers:=${(M)$(_call hosts archie -L):#archie.*}} _wanted hosts expl 'archie servers' && compadd "$expl[@]" - $archie_servers ;; diff --git a/Completion/User/_diff_options b/Completion/User/_diff_options index 5cae712d3..4d994acb6 100644 --- a/Completion/User/_diff_options +++ b/Completion/User/_diff_options @@ -4,7 +4,7 @@ local of ofwuc ouc oss ofwy ofwg ofwl (( $+_diff_is_gnu )) || { _diff_is_gnu=0; - [[ $(command diff -v /dev/null) == *GNU* ]] && _diff_is_gnu=1 + [[ $(_call version diff -v /dev/null) == *GNU* ]] && _diff_is_gnu=1 } if (( _diff_is_gnu )) diff --git a/Completion/User/_finger b/Completion/User/_finger index 9b5760be7..0846acf4e 100644 --- a/Completion/User/_finger +++ b/Completion/User/_finger @@ -4,7 +4,7 @@ local curcontext="$curcontext" state line typeset -A opt_args if (( ! $+_finger_args )); then - local help="$(finger -\? 2>&1)" + local help="$(_call options finger -\? 2>&1)" local -A optionmap ## `finger -\?': diff --git a/Completion/User/_groups b/Completion/User/_groups index 74efe179b..b4ecab38c 100644 --- a/Completion/User/_groups +++ b/Completion/User/_groups @@ -7,7 +7,7 @@ _wanted groups expl group || return 1 if ! zstyle -a ":completion:${curcontext}:" groups groups; then (( $+_cache_groups )) || if (( ${+commands[ypcat]} )); then - : ${(A)_cache_groups:=${${(s: :)$(ypcat group.byname)}%%:*}} # If you use YP + : ${(A)_cache_groups:=${${(s: :)$(_call groups ypcat group.byname)}%%:*}} # If you use YP else : ${(A)_cache_groups:=${${(s: :)$( /dev/null):#(ps|COMMAND)} }' + 'processes:process:{ compadd "$expl[@]" ${$(_call pids ps ho comm 2> /dev/null):#(ps|COMMAND)} }' else _signals -p fi diff --git a/Completion/User/_lp b/Completion/User/_lp index d1c110b1c..51fbb1616 100644 --- a/Completion/User/_lp +++ b/Completion/User/_lp @@ -64,7 +64,7 @@ else else printer=() fi - list=( ${(M)"${(f@)$(lpq $printer 2> /dev/null)}":#[0-9]*} ) + list=( ${(M)"${(f@)$(_call jobs lpq $printer 2> /dev/null)}":#[0-9]*} ) if (( $#list )); then _tags users jobs diff --git a/Completion/User/_telnet b/Completion/User/_telnet index 9df23b87c..2542ff34d 100644 --- a/Completion/User/_telnet +++ b/Completion/User/_telnet @@ -9,7 +9,7 @@ local curcontext="$curcontext" state line expl typeset -A opt_args if (( ! $+_telnet_args )); then - local help="$(telnet -\? < /dev/null 2>&1)" + local help="$(_call options telnet -\? < /dev/null 2>&1)" local -A optionmap optionmap=( '*\[-8\]*' '-8[allow 8-Bit data]' diff --git a/Completion/User/_users_on b/Completion/User/_users_on index 0589e7059..f620f83c7 100644 --- a/Completion/User/_users_on +++ b/Completion/User/_users_on @@ -6,7 +6,7 @@ _tags users || return 1 if which users >/dev/null; then _description users expl 'users logged on' - compadd "$@" "$expl[@]" - $(users) && return 0 + compadd "$@" "$expl[@]" - $(_call users users) && return 0 else # Other methods of finding out users logged on should be added here return 1 diff --git a/Completion/User/_yp b/Completion/User/_yp index 1e86bf278..fe3c0a482 100644 --- a/Completion/User/_yp +++ b/Completion/User/_yp @@ -4,8 +4,8 @@ local curcontext="$curcontext" line state ret=1 typeset -A opt_args if (( ! $+_yp_cache_maps )); then - _yp_cache_maps=( "${(@)${(@f)$(ypwhich -m)}%% *}" ) - _yp_cache_nicks=( "${(@)${(@)${(@f)$(ypwhich -x)}#*\"}%%\"*}" ) + _yp_cache_maps=( "${(@)${(@f)$(_call maps ypwhich -m)}%% *}" ) + _yp_cache_nicks=( "${(@)${(@)${(@f)$(_call names ypwhich -x)}#*\"}%%\"*}" ) _yp_args=( '(-x)-d[specify domain]:domain name:' \ '(-x)-k[display keys]' \ diff --git a/Completion/X/_x_font b/Completion/X/_x_font index 59c628d6d..1be2d3312 100644 --- a/Completion/X/_x_font +++ b/Completion/X/_x_font @@ -9,7 +9,7 @@ _wanted fonts expl font || return 1 if (( ! $+_font_cache )); then typeset -gU _font_cache - _font_cache=( "${(@)^${(@f)$(xlsfonts)}%%--*}--" ) + _font_cache=( "${(@)^${(@f)$(_call fonts xlsfonts)}%%--*}--" ) fi compadd -M 'r:|-=* r:|=*' "$expl[@]" "$@" -S '' - "$_font_cache[@]" diff --git a/Completion/X/_x_window b/Completion/X/_x_window index 139210f32..a79f7fd62 100644 --- a/Completion/X/_x_window +++ b/Completion/X/_x_window @@ -4,7 +4,7 @@ local list expl _tags windows || return 1 -list=( "${(@)${(M@)${(@f)$(xwininfo -root -tree)}:#[ ]#0x[0-9a-f]# \"*}##[ ]#}" ) +list=( "${(@)${(M@)${(@f)$(_call windows xwininfo -root -tree)}:#[ ]#0x[0-9a-f]# \"*}##[ ]#}" ) if [[ "$1" = -n ]]; then shift -- cgit 1.4.1