manual/8424

10 files changed, 12 insertions, 25 deletions

diff --git a/Completion/User/_cvs b/Completion/User/_cvs
index 24a21f8be..ba732cb63 100644
--- a/Completion/User/_cvs
+++ b/Completion/User/_cvs
@@ -514,7 +514,7 @@ builtin functions _cvs_directories >&- ||
 _cvs_directories () {
   if [[ -d ${pref}CVS ]]; then
     _cvs_setup_direntries
-    (( $#entries )) && compgen "$@" -g "${(j:|:)${(@)entries:q}}"
+    (( $#entries )) && _files "$@" -g "${(j:|:)${(@)entries:q}}"
   else
     _files "$@"
   fi
@@ -526,7 +526,7 @@ _cvs_files () {
   _cvs_setup_prefix
   if [[ -d ${pref}CVS ]]; then
     _cvs_setup_allentries
-    (( $#entries )) && compgen "$@" -g "${(j:|:)${(@)entries:q}}"
+    (( $#entries )) && _files "$@" -g "${(j:|:)${(@)entries:q}}"
   else
     _files "$@"
   fi
@@ -538,7 +538,7 @@ _cvs_files_modified () {
   _cvs_setup_prefix
   if [[ -d ${pref}CVS ]]; then
     _cvs_setup_modentries
-    (( $#entries )) && compgen "$@" -g "${(j:|:)${(@)entries:q}}"
+    (( $#entries )) && _files "$@" -g "${(j:|:)${(@)entries:q}}"
   else
     _files "$@"
   fi
@@ -572,8 +572,8 @@ _cvs_files_unmaintained () {
     omit=($_cvs_ignore_default ${entries:q} ${=cvsignore})
     [[ -r ~/.cvsignore ]] && omit=($omit $(<~/.cvsignore))
     [[ -r ${pref}.cvsignore ]] && omit=($omit $(<${pref}.cvsignore))
-    compgen "$@" -g '*~(*/|)('${(j:|:)omit}')(D)' ||
-    compgen "$@" -g '*~(*/|)('${(j:|:)${(@)entries:q}}')(D)' ||
+    _files "$@" -g '*~(*/|)('${(j:|:)omit}')(D)' ||
+    _files "$@" -g '*~(*/|)('${(j:|:)${(@)entries:q}}')(D)' ||
     _cvs_directories "$@"
   else
     _files "$@"
diff --git a/Completion/User/_gdb b/Completion/User/_gdb
index 4e21d7448..fc882ff90 100644
--- a/Completion/User/_gdb
+++ b/Completion/User/_gdb
@@ -47,8 +47,7 @@ else
   if [[ $#w -gt 1 ]]; then
     _files && ret=0
     _description expl 'process ID'
-    list=("${(F)${(@Mr:COLUMNS-1:)${(f)$(ps ${=compconfig[ps_listargs]:-$=compconfig[ps_args]} 2>/dev/null)}[2,-1]:#[ 	]#${PREFIX}[0-9]#${SUFFIX}[ 	]*${w[1]:t}}}
-")
+    list=("${(@M)${(f)$(ps ${=compconfig[ps_listargs]:-$=compconfig[ps_args]} 2>/dev/null)}[2,-1]:#[ 	]#${PREFIX}[0-9]#${SUFFIX}[ 	]*${w[1]:t}*}")
     compadd "$expl[@]" -ld list - ${${${(M)${(f)"$(ps $=compconfig[ps_args] 2>/dev/null)"}:#*${w[1]:t}*}## #}%% *} && ret=0
 
     return ret
diff --git a/Completion/User/_man b/Completion/User/_man
index fd5702227..50445edf6 100644
--- a/Completion/User/_man
+++ b/Completion/User/_man
@@ -1,6 +1,6 @@
 #compdef man apropos whatis
 
-setopt localoptions rcexpandparam extendedglob
+setopt localoptions rcexpandparam
 
 local rep expl star approx
 
diff --git a/Completion/User/_mh b/Completion/User/_mh
index 3a2e53794..87ab8a18e 100644
--- a/Completion/User/_mh
+++ b/Completion/User/_mh
@@ -39,8 +39,7 @@ elif compset -P 1 '[+@]' || [[ "$prev" = -draftfolder ]]; then
   _description expl 'MH folder'
   _path_files "$expl[@]" -W mhpath -/
 elif [[ "$prev" = -(editor|(whatnow|rmm|show|more)proc) ]]; then
-  _description expl command
-  compgen "$expl[@]" -c
+  _command_names -e
 elif [[ "$prev" = -file ]]; then
   _files
 elif [[ "$prev" = -(form|audit|filter) ]]; then
@@ -52,7 +51,7 @@ elif [[ "$prev" = -(form|audit|filter) ]]; then
   mhfpath=($mymhdir $mhlib)
 
   _description expl 'MH template file'
-  compgen "$expl[@]" -W mhfpath -g '*(.)'
+  _files "$expl[@]" -W mhfpath -g '*(.)'
 elif [[ "$prev" = -(no|)cc ]]; then
   _description expl 'CC address'
   compadd "$expl[@]" all to cc me
@@ -79,7 +78,7 @@ else
   compadd "$expl[@]" $(mark $foldnam 2>/dev/null | awk -F: '{ print $1 }') &&
       ret=0
   compadd "$expl[@]" reply next cur prev first last all unseen && ret=0
-  compgen "$expl[@]" -W folddir -g '<->' && ret=0
+  _files "$expl[@]" -W folddir -g '<->' && ret=0
 
   return ret
 fi
diff --git a/Completion/User/_nslookup b/Completion/User/_nslookup
index 6b2585f3d..7bf97a8ad 100644
--- a/Completion/User/_nslookup
+++ b/Completion/User/_nslookup
@@ -19,8 +19,6 @@
 # other characters than lower case letters, we try to call the function
 # `_nslookup_host'.
 
-setopt localoptions extendedglob
-
 local state expl ret=1 setopts
 
 setopts=(
diff --git a/Completion/User/_tar b/Completion/User/_tar
index 63838e83b..d779f6cf1 100644
--- a/Completion/User/_tar
+++ b/Completion/User/_tar
@@ -13,9 +13,6 @@
 #    tar itself (GNU tar)
 #  - Things like --directory=... are also completed correctly.
 
-emulate -LR zsh
-setopt extendedglob
-
 local _tar_cmd tf tmp del
 
 # First we collect in `_tar_cmd' single letter options describing what
diff --git a/Completion/User/_urls b/Completion/User/_urls
index 3b9afc4fd..1bc1ac76d 100644
--- a/Completion/User/_urls
+++ b/Completion/User/_urls
@@ -37,8 +37,6 @@
 #    name used by a user placing web pages within their home area.
 #    e.g. compconf urls_localhttp=www:/usr/local/apache/htdocs:public_html
 
-setopt localoptions extendedglob
-
 local ipre scheme host user hosts ret=1 expl
 local urls_path="${compconfig[urls_path]:-${ZDOTDIR:-$HOME}/.zsh/urls}"
 local localhttp_servername="${${(@s.:.)compconfig[urls_localhttp]}[1]}"
diff --git a/Completion/User/_users b/Completion/User/_users
index a054ccc66..6d0b1ce2f 100644
--- a/Completion/User/_users
+++ b/Completion/User/_users
@@ -10,4 +10,4 @@ _description expl user
 [[ "${(t)users}" = *array* ]] &&
     compadd "$expl[@]" "$@" - "$users[@]" && return 0
 
-compgen "$@" "$expl[@]" -u
+compadd "$@" "$expl[@]" - "${(@k)userdirs}"
diff --git a/Completion/User/_whereis b/Completion/User/_whereis
index 42fc30969..6f11b516c 100644
--- a/Completion/User/_whereis
+++ b/Completion/User/_whereis
@@ -1,6 +1,3 @@
 #compdef whereis
 
-local expl
-
-_description expl command
-compgen "$expl[@]" -m
+_command_names -e
diff --git a/Completion/User/_whois b/Completion/User/_whois
index 827ebe627..580529a72 100644
--- a/Completion/User/_whois
+++ b/Completion/User/_whois
@@ -1,7 +1,6 @@
 #compdef whois
 
 _whois () {
-  setopt localoptions extendedglob
   _whois_setup
   $_whois_comp
 }