diff options
| author | Oliver Kiddle <opk@users.sourceforge.net> | 2005-06-08 12:45:24 +0000 |
|---|---|---|
| committer | Oliver Kiddle <opk@users.sourceforge.net> | 2005-06-08 12:45:24 +0000 |
| commit | 0ba8ae87eac21281e0b17eb9cbb523d133067a4a (patch) | |
| tree | 614cc49ce90c3c2562f83d6739f8ea76dc75d7f0 /Completion/Unix/Type/_printers | |
| parent | 9181f0e3059862d2d8cc109bc849f8705cbbc23c (diff) | |
| download | zsh-0ba8ae87eac21281e0b17eb9cbb523d133067a4a.tar.gz zsh-0ba8ae87eac21281e0b17eb9cbb523d133067a4a.tar.xz zsh-0ba8ae87eac21281e0b17eb9cbb523d133067a4a.zip | |
21315: make completion functions give precendence to descriptions passed as
parameters and cleanup descriptons in calling functions
Diffstat (limited to 'Completion/Unix/Type/_printers')
| -rw-r--r-- | Completion/Unix/Type/_printers | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Completion/Unix/Type/_printers b/Completion/Unix/Type/_printers index 02196daee..edbc9aaae 100644 --- a/Completion/Unix/Type/_printers +++ b/Completion/Unix/Type/_printers @@ -4,7 +4,7 @@ local expl ret=1 list disp sep tmp if (( $+commands[lsallq] )); then # Use AIX's command to list print queues - _wanted printers expl printer compadd $(lsallq) + _wanted printers expl printer compadd "$@" - $(lsallq) return fi @@ -30,11 +30,11 @@ if (( ! $+_lp_cache )); then disp='' fi if [[ -n "$disp" ]]; then - _lp_cache=( "$_lp_cache[@]" "${names[1]}:${disp}" ) - _lp_alias_cache=( "$_lp_alias_cache[@]" "${(@)^names[2,-1]:#*\ *}:${disp}" ) + _lp_cache+=( "${names[1]}:${disp}" ) + _lp_alias_cache+=( "${(@)^names[2,-1]:#*\ *}:${disp}" ) else - _lp_cache=( "$_lp_cache[@]" "${names[1]}" ) - _lp_alias_cache=( "$_lp_alias_cache[@]" "${(@)names[2,-1]:#*\ *}" ) + _lp_cache+=( "${names[1]}" ) + _lp_alias_cache+=( "${(@)names[2,-1]:#*\ *}" ) fi fi done < $file[1] @@ -56,7 +56,7 @@ else disp=() fi _wanted printers expl printer \ - compadd "$disp[@]" - "${(@)_lp_cache%%:*}" && return 0 + compadd "$@" "$disp[@]" - "${(@)_lp_cache%%:*}" && return 0 (( $+_lp_alias_cache )) || return 1 @@ -67,6 +67,6 @@ else disp=() fi _wanted printers expl printer \ - compadd "$disp[@]" - "${(@)_lp_alias_cache%%:*}" && return 0 + compadd "$@" "$disp[@]" - "${(@)_lp_alias_cache%%:*}" && return 0 return 1 |