Tobias Gruetzmacher 21168: locality and visibility of some completion vars

5 files changed, 23 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 80eb9ae71..88531f51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-24  Bart Schaefer  <schaefer@zsh.org>
+
+	* Tobias Gruetzmacher 21168 (slightly tweaked):
+	Completion/Debian/Command/_apt,
+	Completion/Debian/Type/_deb_packages,
+	Completion/Unix/Command/_mount,
+	Completion/Unix/Command/_subversion: localize some completion
+	variables that were unnecessarily made global, and hide from
+	typeset display the values of a few others.
+
 2005-04-24  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* 21170: Src/glob.c, Src/pattern.c: optimise length calculations
@@ -20,7 +30,7 @@
 	dpkg-reconfigure completion.
 
 2005-04-18  Felix Rosencrantz <f_rosencrantz@gmail.com>
-	*  21154: Completion/Unix/Command/_perforce: add pid completion for
+	* 21154: Completion/Unix/Command/_perforce: add pid completion for
 	monitor (clear|terminate) commands.
 
 2005-04-17  Clint Adams  <clint@zsh.org>
diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
index a4623ff8d..50109c970 100644
--- a/Completion/Debian/Command/_apt
+++ b/Completion/Debian/Command/_apt
@@ -57,8 +57,8 @@ _apt_arguments () {
 
   local short_seq false true bool bool_prefix intlevel word word1 nul qnul match
   local comp_bool comp_intlevel comp_configfile comp_arbitem comp_long comp_opt
-  local comp_release
-  local regex_short regex_long regex_all
+  local comp_release comp_long_prefix comp_short
+  local regex_short regex_long regex_all regex_long_prefix
 
   regex_all=( \( "$@" \) )
 
diff --git a/Completion/Debian/Type/_deb_packages b/Completion/Debian/Type/_deb_packages
index 78bc964de..090c9c6b6 100644
--- a/Completion/Debian/Type/_deb_packages
+++ b/Completion/Debian/Type/_deb_packages
@@ -103,6 +103,8 @@ _deb_packages () {
 
   _deb_packages_update_$pkgset
 
+  typeset -gH $cachevar
+
   _tags packages && compadd "$expl[@]" - "${(@P)cachevar}"
 }
 
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 653d7d7c2..5d5f50163 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -40,7 +40,11 @@ fi
 # are below these table.
 
 local curcontext="$curcontext" state line suf ret=1
-local args deffs=iso9660 tmp typeops=-t _nfs_access _nfs_ufs
+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 \
+_fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs _fs_xfs _fs_std _fs_devfs \
+_fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs
 
 typeset -A opt_args
 
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 51f874316..a3613f4a6 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -63,7 +63,7 @@ _svn_command () {
   local cmd
 
   if (( ! $+_svn_cmds )); then
-    typeset -gA _svn_cmds
+    typeset -gHA _svn_cmds
     _svn_cmds=(
       ${=${(f)${${"$(LC_MESSAGES=C _call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
     )
@@ -87,7 +87,7 @@ _svn_command () {
 (( $+functions[_svn_subcommand] )) ||
 _svn_subcommand () {
   local subcmd _svn_subcmds _svn_subcmd_usage
-  typeset -A _cache_svn_status
+  typeset -gHA _cache_svn_status
 
   _svn_subcmd_usage=${${(M)${(f)"$(LC_MESSAGES=C _call_program options svn help $1)"}:#usage:*}#usage: $1 }
 
@@ -146,7 +146,7 @@ _svnadmin_command () {
   local cmd
 
   if (( ! $+_svnadmin_cmds )); then
-    typeset -gA _svnadmin_cmds
+    typeset -gHA _svnadmin_cmds
     _svnadmin_cmds=(
       ${=${(f)${${"$(LC_MESSAGES=C _call_program commands svnadmin help)"#l#*Available subcommands:}}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
     )