From d139ae56432a82a3dbe11f4be89ba7d886f2c177 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Wed, 22 Sep 1999 12:35:20 +0000
Subject: zsh-3.1.6-pws-5

---
 Completion/User/.distfiles | 13 +++++++------
 Completion/User/_dirs      |  3 +++
 Completion/User/_hosts     |  3 ---
 Completion/User/_mailboxes |  7 ++-----
 Completion/User/_man       |  6 +++---
 5 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 Completion/User/_dirs

(limited to 'Completion/User')

diff --git a/Completion/User/.distfiles b/Completion/User/.distfiles
index b17ca6488..579d947f0 100644
--- a/Completion/User/.distfiles
+++ b/Completion/User/.distfiles
@@ -1,9 +1,10 @@
 DISTFILES_SRC='
     .distfiles
-    _a2ps _bison _bunzip2 _bzip2 _chown _compress _configure _cvs _dd
-    _dir_list _dvi _find _flex _gdb _gprof _groups _gs _gunzip _gv _gzip
-    _hosts _ispell _lynx _make _man _man.old _mh _mount _nslookup _patch
-    _pbm _pdf _perl_basepods _perl_builtin_funcs _perl_modules _perldoc _ps
-    _pspdf _rcs _rlogin _sh _socket _ssh _strip _stty _su _tar _tar_archive
-    _telnet _tex _tiff _uncompress _urls _use_lo _users _xargs _yodl _yp
+    _a2ps _bison _bunzip2 _bzip2 _chown _combination _compress _configure
+    _cvs _dd _dir_list _dirs _dvi _find _flex _gcc _gdb _gprof _groups _gs
+    _gunzip _gv _gzip _hosts _ispell _lynx _mailboxes _make _man _mh _mount
+    _mutt _nslookup _patch _pbm _pdf _perl_basepods _perl_builtin_funcs
+    _perl_modules _perldoc _ports _ps _pspdf _rcs _rlogin _sh _socket _ssh
+    _strip _stty _su _tar _tar_archive _telnet _tex _tiff _uncompress _urls
+    _use_lo _users _webbrowser _wget _xargs _yodl _yp
 '
diff --git a/Completion/User/_dirs b/Completion/User/_dirs
new file mode 100644
index 000000000..04c4b75d9
--- /dev/null
+++ b/Completion/User/_dirs
@@ -0,0 +1,3 @@
+#compdef rmdir df du dircmp
+
+_files -/
diff --git a/Completion/User/_hosts b/Completion/User/_hosts
index bbc1e88b2..9f5a39cca 100644
--- a/Completion/User/_hosts
+++ b/Completion/User/_hosts
@@ -4,8 +4,5 @@ local expl
 
 : ${(A)hosts:=${(s: :)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}}
 
-# Let the user add her own hosts in if she wants
-hosts=( $hostnames $hosts )
-
 _description expl host
 compadd -M 'm:{a-zA-Z}={A-Za-z} r:|.=* r:|=*' "$@" "$expl[@]" - "$hosts[@]"
diff --git a/Completion/User/_mailboxes b/Completion/User/_mailboxes
index eee6c6f35..08dbec816 100644
--- a/Completion/User/_mailboxes
+++ b/Completion/User/_mailboxes
@@ -12,7 +12,7 @@ local maildirectory="${maildirectory:-~/Mail}"
 
 if (( ! $+_mailbox_cache )) then
 
-test ${~muttrc} && [[ -f ${~muttrc} ]] && muttboxes=( ${$(grep mailboxes ${~muttrc})[2,-1]} )
+[[ -f "${~muttrc}" ]] && muttboxes=( ${$(grep mailboxes ${~muttrc})[2,-1]} )
 
 mboxes=( ${~maildirectory}/*(^/) ${~pinedirectory}/**/*(.) )
 dirboxes=( ${~maildirectory}/*(/) )
@@ -33,11 +33,8 @@ do
     fi
 done
 
-[[ -n "$muttboxes" ]] || [[ -d ~/.elm ]] &&
+[[ -n "$muttboxes" ]] &&
     _mailbox_cache=(\! \< \> $muttboxes)
-[[ -n "$mailpath" ]] &&
-    _mailbox_cache=($_mailbox_cache ${mailpath//\?*/})
-
 _mailbox_cache=($_mailbox_cache $mboxes $maildirboxes $MHboxes)
 
 fi
diff --git a/Completion/User/_man b/Completion/User/_man
index ffdac91cd..88d2118c0 100644
--- a/Completion/User/_man
+++ b/Completion/User/_man
@@ -14,11 +14,11 @@ if [[ -n $_comp_correct ]]; then
   approx="(#a${_comp_correct})"
 fi
 
-# `sman' is the SGML manual directory for Solaris 7.
-
-[ "$manpath" ] || manpath=$(manpath 2>/dev/null) || \
+(( $#manpath )) || manpath=$(manpath 2>/dev/null) ||
   manpath=( /usr/man(-/N) /(opt|usr)/(dt|share|X11R6|local)/(cat|)man(-/N) )
 
+# `sman' is the SGML manual directory for Solaris 7.
+
 if [[ $words[2] = (<->*|ln) ]]; then
   rep=(
   $manpath/(sman|man|cat)${words[2]}/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t) )
-- 
cgit 1.4.1