about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Completion/User/_mailboxes6
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fdc0f42d..e88efb90f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-2000-11-08  Bart Schaefer  <schaefer@zsh.org>
+2000-11-09  Clint Adams  <schizo@debian.org>
 
-	* 13140: Src/utils.c: Believe the non-error not-ready return value
-	from select(), in read_poll().
+	* 13125: Completion/User/_mailboxes: evaluate the mailboxes
+	directives in muttrc, in case of backticks.
 
 2000-11-08  Sven Wischnowsky  <wischnow@zsh.org>
 
diff --git a/Completion/User/_mailboxes b/Completion/User/_mailboxes
index 356b377ec..b20abcf4e 100644
--- a/Completion/User/_mailboxes
+++ b/Completion/User/_mailboxes
@@ -62,15 +62,15 @@ _mailboxes() {
 _mailbox_cache () {
   # Depends on $maildirectory and $pinedirectory from _mailboxes!
 
-  local i j muttrc="${muttrc:-~/.muttrc}"
+  local i j _mc_tmp muttrc="${muttrc:-~/.muttrc}"
   local -aU dirboxes
   typeset -aU -g _mailbox_cache
   typeset -aU -g _maildir_cache _mbox_cache _mh_cache _mutt_cache _pine_cache
 
 
   [[ -f ${~muttrc:-.} ]] &&
-    _mutt_cache=( ${=${(M)${(f)"$(<${~muttrc})"}:#mailboxes *}#mailboxes *} )
-
+    _mc_tmp=${=${(M)${(f)"$(<${~muttrc})"}:#mailboxes *}#mailboxes *} &&
+    _mutt_cache=( ${=${(Xe)_mc_tmp}} )
 
   _mbox_cache=( ${~maildirectory}/*(^/) )
   _pine_cache=( ${~pinedirectory}/**/*(.) )