From a939aea7a72526a18eb219ae29c994e764b4d0e3 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Tue, 21 Sep 1999 01:46:31 +0000
Subject: zsh-workers/7961

---
 Completion/User/_mailboxes | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Completion/User/_mailboxes b/Completion/User/_mailboxes
index 08dbec816..eee6c6f35 100644
--- a/Completion/User/_mailboxes
+++ b/Completion/User/_mailboxes
@@ -12,7 +12,7 @@ local maildirectory="${maildirectory:-~/Mail}"
 
 if (( ! $+_mailbox_cache )) then
 
-[[ -f "${~muttrc}" ]] && muttboxes=( ${$(grep mailboxes ${~muttrc})[2,-1]} )
+test ${~muttrc} && [[ -f ${~muttrc} ]] && muttboxes=( ${$(grep mailboxes ${~muttrc})[2,-1]} )
 
 mboxes=( ${~maildirectory}/*(^/) ${~pinedirectory}/**/*(.) )
 dirboxes=( ${~maildirectory}/*(/) )
@@ -33,8 +33,11 @@ do
     fi
 done
 
-[[ -n "$muttboxes" ]] &&
+[[ -n "$muttboxes" ]] || [[ -d ~/.elm ]] &&
     _mailbox_cache=(\! \< \> $muttboxes)
+[[ -n "$mailpath" ]] &&
+    _mailbox_cache=($_mailbox_cache ${mailpath//\?*/})
+
 _mailbox_cache=($_mailbox_cache $mboxes $maildirboxes $MHboxes)
 
 fi
-- 
cgit 1.4.1