zsh-workers/8840

27 files changed, 50 insertions, 50 deletions

diff --git a/Completion/User/_bunzip2 b/Completion/User/_bunzip2
index 53f4388bc..48e56bf0f 100644
--- a/Completion/User/_bunzip2
+++ b/Completion/User/_bunzip2
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'compressed file'
+_description files expl 'compressed file'
 _files "$expl[@]" -g '*.bz2'
diff --git a/Completion/User/_bzip2 b/Completion/User/_bzip2
index 15dd6f090..0abdf4daa 100644
--- a/Completion/User/_bzip2
+++ b/Completion/User/_bzip2
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'file to compress'
+_description files expl 'file to compress'
 _files "$expl[@]" -g '*~*.bz2'
diff --git a/Completion/User/_compress b/Completion/User/_compress
index 24363be07..ccffeaeef 100644
--- a/Completion/User/_compress
+++ b/Completion/User/_compress
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'file to compress'
+_description files expl 'file to compress'
 _files "$expl[@]" -g '*~*.Z'
diff --git a/Completion/User/_dd b/Completion/User/_dd
index 3a980b48d..fb78f194a 100644
--- a/Completion/User/_dd
+++ b/Completion/User/_dd
@@ -10,10 +10,10 @@ if compset -P 1 'conv\='; then
       compadd "$expl[@]" -qS, -q \
               ascii ebcdic ibm block unblock lcase ucase swab noerror sync
 elif compset -P 1 'if\='; then
-  _description expl 'input file'
+  _description files expl 'input file'
   _files "$expl[@]"
 elif compset -P 1 'of\='; then
-  _description expl 'output file'
+  _description files expl 'output file'
   _files "$expl[@]"
 else
   _wanted values expl option &&
diff --git a/Completion/User/_dvi b/Completion/User/_dvi
index 4d36e237e..40794e246 100644
--- a/Completion/User/_dvi
+++ b/Completion/User/_dvi
@@ -89,7 +89,7 @@ dvitodvi)
     "$args[@]"
   ;;
 *)
-  _description expl 'DVI file'
+  _description files expl 'DVI file'
   _files "$expl[@]" -g '*.(dvi|DVI)'
   ;;
 esac
diff --git a/Completion/User/_gdb b/Completion/User/_gdb
index d037b83d9..a095370ab 100644
--- a/Completion/User/_gdb
+++ b/Completion/User/_gdb
@@ -12,7 +12,7 @@ if compset -P '-(cd|directory)='; then
 elif compset -P '-tty='; then
   _wanted devices expl 'terminal device' && compadd "$expl[@]" - /dev/tty*
 elif compset -P '-(exec|se)='; then
-  _description expl executable
+  _description files expl executable
   _files "$expl[@]" -g '*(*)'
 elif compset -P '-(symbols|core|command)='; then
   _files
@@ -29,9 +29,9 @@ else
   case "$prev" in
   (-d)     _files -/ && return 0 ;;
   (-[csx]) _files && return 0 ;;
-  (-e)     _description expl executable
+  (-e)     _description files expl executable
            _files "$expl[@]" -g '*(*)' && return 0 ;;
-  (-b)     _wanted values expl -V expl 'baud rate' &&
+  (-b)     _wanted -V values expl 'baud rate' &&
                compadd "$expl[@]" 0 50 75 110 134 150 200 300 600 1200 1800 \
 			          2400 4800 9600 19200 38400 57600 115200 \
 			          230400 && return 0 ;;
@@ -46,7 +46,7 @@ else
   if [[ $#w -gt 1 ]]; then
     _alternative 'files:: _files' "processes:: _pids -m ${w[1]:t}"
   else
-    _description expl executable
+    _description files expl executable
     _files "$expl[@]" -g '*(*)'
   fi
 fi
diff --git a/Completion/User/_gprof b/Completion/User/_gprof
index a69a078ba..80de70bb4 100644
--- a/Completion/User/_gprof
+++ b/Completion/User/_gprof
@@ -41,12 +41,12 @@ if [[ -n "$state" ]]; then
   
     if [[ -n "$pair" ]]; then
       if compset -P '*/'; then
-        _description expl 'call arc to function'
+        _description functions expl 'call arc to function'
       else
-        _description expl 'call arc from function'
+        _description functions expl 'call arc from function'
       fi
     else
-      _description expl function
+      _description functions expl function
     fi
     compadd "$expl[@]" -M 'r:|_=* r:|=*' - "$_gprof_funcs[@]" && ret=0
   else
diff --git a/Completion/User/_gs b/Completion/User/_gs
index 14f544425..35a1d5388 100644
--- a/Completion/User/_gs
+++ b/Completion/User/_gs
@@ -39,7 +39,7 @@ else
             compadd "$expl[@]" - "${(@)${=${$(gs -h)##* devices:}%%Search path:*}:#}" && ret=0
         ;;
       *OutputFile\=)
-        _description expl 'output file'
+        _description files expl 'output file'
         _files "$expl[@]" && ret=0
         ;;
       *)
diff --git a/Completion/User/_gunzip b/Completion/User/_gunzip
index 78e62c4cc..9c512bd30 100644
--- a/Completion/User/_gunzip
+++ b/Completion/User/_gunzip
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'compressed file'
+_description files expl 'compressed file'
 _files "$expl[@]" -g '*.[gG][z]'
diff --git a/Completion/User/_gzip b/Completion/User/_gzip
index 07b51dead..e87682666 100644
--- a/Completion/User/_gzip
+++ b/Completion/User/_gzip
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'file to compress'
+_description files expl 'file to compress'
 _files "$expl[@]" -g '*~*.[gG][zZ]'
diff --git a/Completion/User/_mh b/Completion/User/_mh
index e4d042dc2..bdd4c74b3 100644
--- a/Completion/User/_mh
+++ b/Completion/User/_mh
@@ -36,7 +36,7 @@ elif compset -P 1 '[+@]' || [[ "$prev" = -draftfolder ]]; then
   fi
 
   # painless, or what?
-  _description expl 'MH folder'
+  _description files expl 'MH folder'
   _path_files "$expl[@]" -W mhpath -/
 elif [[ "$prev" = -(editor|(whatnow|rmm|show|more)proc) ]]; then
   _command_names -e
@@ -50,7 +50,7 @@ elif [[ "$prev" = -(form|audit|filter) ]]; then
   [[ -d $mhlib ]] || { mhlib=$(mhparam mhlproc); mhlib=$mhlib:h; }
   mhfpath=($mymhdir $mhlib)
 
-  _description expl 'MH template file'
+  _description files expl 'MH template file'
   _files "$expl[@]" -W mhfpath -g '*(.)'
 elif [[ "$prev" = -(no|)cc ]]; then
   _wanted -C "$prev" values expl 'CC address' &&
diff --git a/Completion/User/_mutt b/Completion/User/_mutt
index 98c59b2e0..c2af49107 100644
--- a/Completion/User/_mutt
+++ b/Completion/User/_mutt
@@ -28,10 +28,10 @@ if [[ "$state" = userhost ]]; then
   _tags hosts || return 1
 
   if compset -P '*@'; then
-    _description expl 'remote host name'
+    _description hosts expl 'remote host name'
     _hosts "$expl[@]" -q -S, && return 0
   else
-    _description expl 'login name'
+    _description users expl 'login name'
     _users "$expl[@]" -q -S@ && return 0
    fi
  fi
diff --git a/Completion/User/_netscape b/Completion/User/_netscape
index 9dc3873a0..23601de12 100644
--- a/Completion/User/_netscape
+++ b/Completion/User/_netscape
@@ -78,7 +78,7 @@ if [[ "$state" = "urls" ]]; then
             license logo memory-cache mozilla plugins && ret=0
   else
     if _tags prefixes; then
-      _description expl 'URL prefix'
+      _description prefixes expl 'URL prefix'
       compadd "$expl[@]" -S '' about: mocha: javascript:
       _urls "$@" && ret=0
     fi
diff --git a/Completion/User/_nslookup b/Completion/User/_nslookup
index 13500ff2c..1aeae4306 100644
--- a/Completion/User/_nslookup
+++ b/Completion/User/_nslookup
@@ -66,9 +66,9 @@ if [[ -n "$compcontext" ]]; then
       _message "redirection not allowed for command \`$words[1]'"
       return 1
     elif [[ "$compstate[redirect]" = '>' ]]; then
-      _description expl 'write to file'
+      _description files expl 'write to file'
     elif [[ "$compstate[redirect]" = '>>' ]]; then
-      _description expl 'append to file'
+      _description files expl 'append to file'
     else
       _message "unknown redirection operator \`$compstate[redirect]'"
       return 1
@@ -107,7 +107,7 @@ if [[ -n "$compcontext" ]]; then
     return
     ;;
   view)
-    _description expl 'view file'
+    _description files expl 'view file'
     _files "$expl[@]"
     return
     ;;
@@ -144,9 +144,9 @@ if [[ -n "$state" ]]; then
   _tags hosts || return 1
 
   if compset -P '*/'; then
-    _description expl 'search list entry'
+    _description hosts expl 'search list entry'
   else
-    _description expl 'default domain name and first search list entry'
+    _description hosts expl 'default domain name and first search list entry'
   fi
   if [[ -n "$_vals_cache_multi" ]]; then
     _hosts "$expl[@]" -qS/ -r "/\\- \\t\\n$_vals_cache_multi"
diff --git a/Completion/User/_pack b/Completion/User/_pack
index a15cfa709..39539ee61 100644
--- a/Completion/User/_pack
+++ b/Completion/User/_pack
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'file to compress'
+_description files expl 'file to compress'
 _files "$expl[@]" -g '*~*.z'
diff --git a/Completion/User/_pbm b/Completion/User/_pbm
index 9eecd0390..7eff60c69 100644
--- a/Completion/User/_pbm
+++ b/Completion/User/_pbm
@@ -18,7 +18,7 @@ fi
   
 if [[ $# -ne 0 || $+_in_pbm -ne 0 ]]; then
   if (( ! $# )); then
-    _description expl 'picture file'
+    _description files expl 'picture file'
     set -- "$expl[@]"
   fi
   _files "$@" -g "$pat" || _files "$@" -g '*.(#i)p[bgp]m'
@@ -258,7 +258,7 @@ pgmtoppm)
   
     return ret
   elif [[ CURRENT -eq 3 && "$words[2]" = -map ]]; then
-    _description expl 'map file'
+    _description files expl 'map file'
     _files "$expl[@]" -g '*.(#i)ppm'
   else
     _pbm
@@ -516,9 +516,9 @@ ppmchange)
   _pbm && ret=0
   
   if (( CURRENT & 1 )); then
-    _description expl 'new color'
+    _description colors expl 'new color'
   else
-    _description expl 'old color'
+    _description colors expl 'old color'
   fi
   
   _x_color "$expl[@]" && ret=0
@@ -600,7 +600,7 @@ ppmquant)
   
     return ret
   elif [[ CURRENT -eq 3 && "$words[2]" = -map ]]; then
-    _description expl 'map file'
+    _description files expl 'map file'
     _files "$expl[@]" -g '*.(#i)ppm'
   else
     _pbm
@@ -742,7 +742,7 @@ rgb3toppm)
   fi
   
   if [[ -n "$expl" ]]; then
-    _description expl "$expl"
+    _description files expl "$expl"
     _files "$expl" -g '*.(#i)pgm'
   fi
   ;;
@@ -772,7 +772,7 @@ zeisstopnm)
   _arguments '(-pgm -ppm)'-p{g,p}m ':file: _pbm'
   ;;
 
-*) 
-  _description expl 'picture file'
+*)
+  _description files expl 'picture file'
   _files "$expl[@]" -g "$pat" || _files "$expl[@]" -g '*.(#i)p[bgp]m'
 esac
diff --git a/Completion/User/_pdf b/Completion/User/_pdf
index 795e8545b..efc511669 100644
--- a/Completion/User/_pdf
+++ b/Completion/User/_pdf
@@ -7,5 +7,5 @@ local expl
 # xpdf:
 #  pdfimages pdfinfo pdftopbm pdftops pdftotext xpdf
 
-_description expl 'PDF file'
+_description files expl 'PDF file'
 _files "$expl[@]" -g '*.(#i)pdf'
diff --git a/Completion/User/_ps b/Completion/User/_ps
index 086443586..c8d1bd53a 100644
--- a/Completion/User/_ps
+++ b/Completion/User/_ps
@@ -9,5 +9,5 @@ local expl
 #  fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psbook psmerge
 #  psnup psresize psselect pstops
 
-_description expl 'postscript file'
+_description files expl 'postscript file'
 _files "$expl[@]" -g '*.(#i)(ps|eps)'
diff --git a/Completion/User/_pspdf b/Completion/User/_pspdf
index b4dadb3d0..7dbccbf48 100644
--- a/Completion/User/_pspdf
+++ b/Completion/User/_pspdf
@@ -6,7 +6,7 @@ local ret=1 expl
 #  gs gsbj gsdj gsdj500 gslj gslp gsnd ps2ascii
 
 _ps && ret=0
-_description expl 'PDF file'
+_description files expl 'PDF file'
 _path_files "$expl[@]" -g '*.(#i)pdf'
 
 return ret
diff --git a/Completion/User/_ssh b/Completion/User/_ssh
index 4318caf96..9b07a62cf 100644
--- a/Completion/User/_ssh
+++ b/Completion/User/_ssh
@@ -57,7 +57,7 @@ _ssh () {
                     ret=0
             ;;
           *(#i)globalknownhostsfile*)
-            _description expl 'global file with known hosts'
+            _description files expl 'global file with known hosts'
             _files "$expl[@]" && ret=0
             ;;
           *(#i)hostname*)
@@ -65,7 +65,7 @@ _ssh () {
                 _ssh_hosts "$expl[@]" && ret=0
             ;;
           *(#i)identityfile*)
-            _description expl 'SSH identity file'
+            _description files expl 'SSH identity file'
             _files "$expl[@]" && ret=0
             ;;
           *(#i)(local|remote)forward*)
@@ -82,7 +82,7 @@ _ssh () {
 	        compadd "$expl[@]" yes no ask
             ;;
           *(#i)userknownhostsfile*)
-            _description expl 'user file with known hosts'
+            _description files expl 'user file with known hosts'
             _files "$expl[@]" && ret=0
             ;;
           *(#i)user*)
@@ -90,7 +90,7 @@ _ssh () {
                 _ssh_users "$expl[@]" && ret=0
             ;;
           *(#i)xauthlocation*)
-            _description expl 'xauth program'
+            _description files expl 'xauth program'
             _files "$expl[@]" -g '*(*)' && ret=0
             ;;
           esac
diff --git a/Completion/User/_strip b/Completion/User/_strip
index 529176fdd..378eafe99 100644
--- a/Completion/User/_strip
+++ b/Completion/User/_strip
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl executable
+_description files expl executable
 _files "$expl[@]" -g '*(*)'
diff --git a/Completion/User/_tar_archive b/Completion/User/_tar_archive
index 9ddf434f5..2c2696481 100644
--- a/Completion/User/_tar_archive
+++ b/Completion/User/_tar_archive
@@ -11,7 +11,7 @@ local expl
 
 [[ $# -eq 0 && $+_tar_cmd -ne 0 ]] && set "$_tar_cmd"
 
-_description expl 'archive file'
+_description files expl 'archive file'
 
 if [[ "$1" = *[tx]* ]]; then
   if [[ "$1" = *[zZ]* ]]; then
diff --git a/Completion/User/_tex b/Completion/User/_tex
index d270c785a..4775d1bbc 100644
--- a/Completion/User/_tex
+++ b/Completion/User/_tex
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'TeX or LaTeX file'
+_description files expl 'TeX or LaTeX file'
 _files "$expl[@]" -g '*.(tex|TEX|texinfo|texi)'
diff --git a/Completion/User/_tiff b/Completion/User/_tiff
index 27ab33227..a0fb0d4b4 100644
--- a/Completion/User/_tiff
+++ b/Completion/User/_tiff
@@ -10,7 +10,7 @@ fi
 
 if [[ $# -ne 0 || $+_in_tiff -ne 0 ]]; then
   if (( ! $# )); then
-    _description expl 'picture file'
+    _description files expl 'picture file'
     set -- "$expl[@]"
   fi
   _path_files "$@" -g "$pat" || _files "$@" -g '*.(#i)tiff'
@@ -166,7 +166,7 @@ pal2rgb)
     ':output file:_files -g \*.\(\#i\)tiff' && ret=0
   ;;
 *)
-  _description expl 'picture file'
+  _description files expl 'picture file'
   _files "$expl[@]" -g "$pat" && ret=0
 esac
 
diff --git a/Completion/User/_uncompress b/Completion/User/_uncompress
index f352ca15a..a0ac14484 100644
--- a/Completion/User/_uncompress
+++ b/Completion/User/_uncompress
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'compressed file'
+_description files expl 'compressed file'
 _files "$expl[@]" -g '*.Z'
diff --git a/Completion/User/_unpack b/Completion/User/_unpack
index fb8867560..7345c2e94 100644
--- a/Completion/User/_unpack
+++ b/Completion/User/_unpack
@@ -2,5 +2,5 @@
 
 local expl
 
-_description expl 'compressed file'
+_description files expl 'compressed file'
 _files "$expl[@]" -g '*.z'
diff --git a/Completion/User/_users_on b/Completion/User/_users_on
index 3d35af02b..0589e7059 100644
--- a/Completion/User/_users_on
+++ b/Completion/User/_users_on
@@ -5,7 +5,7 @@ local expl
 _tags users || return 1
 
 if which users >/dev/null; then
-  _description expl 'users logged on'
+  _description users expl 'users logged on'
   compadd "$@" "$expl[@]" - $(users) && return 0
 else
   # Other methods of finding out users logged on should be added here