From 0d8d202ff5491382a7576508d80166f89aac4157 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 8 Jun 2005 05:33:45 +0000 Subject: 21302: make sure expl is declared local in completion functions --- Completion/Linux/Command/_pkgtool | 2 ++ Completion/Unix/Command/_ant | 2 +- Completion/Unix/Command/_bogofilter | 2 +- Completion/Unix/Command/_cdrecord | 2 +- Completion/Unix/Command/_chkconfig | 2 +- Completion/Unix/Command/_chmod | 2 +- Completion/Unix/Command/_gs | 2 +- Completion/Unix/Command/_look | 2 +- Completion/Unix/Command/_mount | 2 +- Completion/Unix/Command/_python | 2 +- Completion/Unix/Command/_rar | 2 +- Completion/Unix/Type/_file_systems | 2 +- Completion/Unix/Type/_global_tags | 2 ++ Completion/Unix/Type/_locales | 2 +- Completion/Unix/Type/_user_at_host | 2 +- Completion/X/Command/_mozilla | 2 +- Completion/X/Command/_mplayer | 2 +- Completion/X/Command/_netscape | 2 +- Completion/X/Type/_x_visual | 2 ++ Completion/Zsh/Context/_equal | 2 ++ 20 files changed, 24 insertions(+), 16 deletions(-) (limited to 'Completion') diff --git a/Completion/Linux/Command/_pkgtool b/Completion/Linux/Command/_pkgtool index 5ec95469c..0dd2d6769 100644 --- a/Completion/Linux/Command/_pkgtool +++ b/Completion/Linux/Command/_pkgtool @@ -1,5 +1,7 @@ #compdef installpkg upgradepkg removepkg pkgtool explodepkg makepkg +local expl + case "$service" in installpkg) _arguments \ diff --git a/Completion/Unix/Command/_ant b/Completion/Unix/Command/_ant index e2f4a9dc5..19860f55f 100644 --- a/Completion/Unix/Command/_ant +++ b/Completion/Unix/Command/_ant @@ -2,7 +2,7 @@ # Apache Ant version 1.6.4 -local curcontext="$curcontext" state line ret=1 +local curcontext="$curcontext" state line expl ret=1 typeset -A opt_args local buildfile classpath cp userjars importedfiles target='*:target:->target' targets tmp diff --git a/Completion/Unix/Command/_bogofilter b/Completion/Unix/Command/_bogofilter index 2e7a30f00..9e6ac3f88 100644 --- a/Completion/Unix/Command/_bogofilter +++ b/Completion/Unix/Command/_bogofilter @@ -1,6 +1,6 @@ #compdef bogoutil bogotune bogofilter -local ret bogotokens +local expl ret bogotokens _bogoutil_caching_policy () { diff --git a/Completion/Unix/Command/_cdrecord b/Completion/Unix/Command/_cdrecord index 2fab4faf4..8235d0789 100644 --- a/Completion/Unix/Command/_cdrecord +++ b/Completion/Unix/Command/_cdrecord @@ -1,6 +1,6 @@ #compdef cdrecord -local curcontext="$curcontext" state line ret=1 +local curcontext="$curcontext" state line expl ret=1 local devices btypes _arguments -C \ diff --git a/Completion/Unix/Command/_chkconfig b/Completion/Unix/Command/_chkconfig index 912ac3829..76da38d27 100644 --- a/Completion/Unix/Command/_chkconfig +++ b/Completion/Unix/Command/_chkconfig @@ -1,6 +1,6 @@ #compdef chkconfig -local curcontext="$curcontext" state line ret=1 +local curcontext="$curcontext" state line expl ret=1 case $OSTYPE in linux*) diff --git a/Completion/Unix/Command/_chmod b/Completion/Unix/Command/_chmod index c3c949959..1c0e7aadc 100644 --- a/Completion/Unix/Command/_chmod +++ b/Completion/Unix/Command/_chmod @@ -1,6 +1,6 @@ #compdef chmod -local curcontext="$curcontext" state line ret=1 +local curcontext="$curcontext" state line expl ret=1 local -a args privs args=( '*:file:->files' ) diff --git a/Completion/Unix/Command/_gs b/Completion/Unix/Command/_gs index 345be0208..fceedcea7 100644 --- a/Completion/Unix/Command/_gs +++ b/Completion/Unix/Command/_gs @@ -8,7 +8,7 @@ if compset -N --; then return 1 fi else - local curcontext="$curcontext" state line ret=1 + local curcontext="$curcontext" state line expl ret=1 typeset -A opt_args _x_arguments -C \ diff --git a/Completion/Unix/Command/_look b/Completion/Unix/Command/_look index 825488c37..94a90bc3f 100644 --- a/Completion/Unix/Command/_look +++ b/Completion/Unix/Command/_look @@ -1,6 +1,6 @@ #compdef look -local curcontext="$curcontext" state line ret=1 +local curcontext="$curcontext" state line expl ret=1 typeset -A opt_args _arguments -C -s \ diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount index 302584122..d905664c7 100644 --- a/Completion/Unix/Command/_mount +++ b/Completion/Unix/Command/_mount @@ -39,7 +39,7 @@ fi # arguments for the `mount' command for different operating systems # are below these table. -local curcontext="$curcontext" state line suf ret=1 +local curcontext="$curcontext" state line expl suf ret=1 local args deffs=iso9660 tmp typeops=-t _fs_any _nfs_access _fs_nfs _nfs_ufs \ _fs_ufs _fs_efs _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs _fs_hsfs \ _fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos _fs_umsdos \ diff --git a/Completion/Unix/Command/_python b/Completion/Unix/Command/_python index bb048fc68..dc399b789 100644 --- a/Completion/Unix/Command/_python +++ b/Completion/Unix/Command/_python @@ -2,7 +2,7 @@ # Python 2.4 -local curcontext="$curcontext" state line +local curcontext="$curcontext" state line expl typeset -A opt_args _arguments -s -S \ diff --git a/Completion/Unix/Command/_rar b/Completion/Unix/Command/_rar index 8b12dc8eb..57a5a995d 100644 --- a/Completion/Unix/Command/_rar +++ b/Completion/Unix/Command/_rar @@ -1,6 +1,6 @@ #compdef rar unrar -local common +local common expl common=( '-ad[append archive name to destination path]' diff --git a/Completion/Unix/Type/_file_systems b/Completion/Unix/Type/_file_systems index d541fac15..50b3ed744 100644 --- a/Completion/Unix/Type/_file_systems +++ b/Completion/Unix/Type/_file_systems @@ -1,6 +1,6 @@ #autoload -local fss +local expl fss case $OSTYPE in aix*) fss=( jfs nfs cdrfs ) ;; diff --git a/Completion/Unix/Type/_global_tags b/Completion/Unix/Type/_global_tags index 9f7abdfa5..a877ce86b 100644 --- a/Completion/Unix/Type/_global_tags +++ b/Completion/Unix/Type/_global_tags @@ -1,4 +1,6 @@ #autoload +local expl + _wanted global-tags expl 'tag' compadd -M 'm:{a-zA-Z}={A-Za-z}' \ -a "$@" - $(_call_program global-tags global --completion $PREFIX) diff --git a/Completion/Unix/Type/_locales b/Completion/Unix/Type/_locales index d8d1ed451..edc86ed78 100644 --- a/Completion/Unix/Type/_locales +++ b/Completion/Unix/Type/_locales @@ -1,6 +1,6 @@ #compdef -value-,LANG,-default- -value-,LANGUAGE,-default- -P -value-,LC_*,-default- -local locales +local expl locales if (( $+commands[locale] )); then locales=( $(_call_program locales locale -a) ) diff --git a/Completion/Unix/Type/_user_at_host b/Completion/Unix/Type/_user_at_host index b652242d3..a242ddeb6 100644 --- a/Completion/Unix/Type/_user_at_host +++ b/Completion/Unix/Type/_user_at_host @@ -5,7 +5,7 @@ # with `-t tag'. # A `-' or `--' as the first argument is ignored. -local suf tag=accounts +local expl suf tag=accounts if [[ "$1" = -t?* ]]; then tag="${1[3,-1]}" diff --git a/Completion/X/Command/_mozilla b/Completion/X/Command/_mozilla index f6ade49fc..890aa7b53 100644 --- a/Completion/X/Command/_mozilla +++ b/Completion/X/Command/_mozilla @@ -1,6 +1,6 @@ #compdef mozilla mozilla-firefox mozilla-xremote-client -local curcontext="$curcontext" state line ret=1 suf +local curcontext="$curcontext" state line expl ret=1 suf typeset -A opt_args local popts="-installer -CreateProfile -P -ProfileWizard -ProfileManager -SelectProfile" diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer index 8be53b52e..d7205d1ae 100644 --- a/Completion/X/Command/_mplayer +++ b/Completion/X/Command/_mplayer @@ -1,7 +1,7 @@ #compdef mplayer gmplayer local suf ret=1 curcontext="$curcontext" -local -a vals state line +local -a vals state line expl _x_arguments -C -s \ '!-abs:buffer size' \ diff --git a/Completion/X/Command/_netscape b/Completion/X/Command/_netscape index a6f9ac3fc..e1d02ae90 100644 --- a/Completion/X/Command/_netscape +++ b/Completion/X/Command/_netscape @@ -1,6 +1,6 @@ #compdef netscape -local curcontext="$curcontext" state line ret=1 suf files +local curcontext="$curcontext" state line expl ret=1 suf files typeset -A opt_args _x_arguments -C \ diff --git a/Completion/X/Type/_x_visual b/Completion/X/Type/_x_visual index 13b42ca6e..b28208444 100644 --- a/Completion/X/Type/_x_visual +++ b/Completion/X/Type/_x_visual @@ -1,5 +1,7 @@ #autoload +local expl + # with the -b option, include `Best' in the matches local best="${argv[(r)-b]:+Best}" argv[(i)-b]=() diff --git a/Completion/Zsh/Context/_equal b/Completion/Zsh/Context/_equal index b4d911541..a1577d62c 100644 --- a/Completion/Zsh/Context/_equal +++ b/Completion/Zsh/Context/_equal @@ -1,3 +1,5 @@ #compdef -equal- +local expl + _wanted commands expl command compadd -k commands -- cgit 1.4.1