about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Completion/User/_mailboxes8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1206c4d46..6d4ea4ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-25  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
+
+	* 13743: Completion/User/_mailboxes: handle @folder in MH.
+
 2001-03-24  Bart Schaefer  <schaefer@zsh.org>
 
 	* 13740: Completion/User/_mailboxes: Fixes for mh (based on PWS's
diff --git a/Completion/User/_mailboxes b/Completion/User/_mailboxes
index 6b3ece850..53f452ce5 100644
--- a/Completion/User/_mailboxes
+++ b/Completion/User/_mailboxes
@@ -118,14 +118,14 @@ _mua_mailboxes() {
       fi
       ;;
     (*:mh:*)
-#     local lastmhbox=???	# Where does this come from?
+      local lastmhbox=$(mhpath)
       if compset -P +; then
 	mbox_names=( "${(@)_mh_cache#$~maildirectory/}" )
-#     elif compset -P @; then
-#	mbox_names=( "${(@)${(@M)_mh_cache:#$~lastmhbox/*}#$~lastmhbox/}" )
+      elif compset -P @; then
+	mbox_names=( "${(@)${(@M)_mh_cache:#$~lastmhbox/*}#$~lastmhbox/}" )
       else
 	mbox_names=( +"${(@)^_mh_cache#$~maildirectory/}"
-#		     @"${(@)^${(@M)_mh_cache:#$~lastmhbox/*}#$~lastmhbox/}"
+		     @"${(@)^${(@M)_mh_cache:#$~lastmhbox/*}#$~lastmhbox/}"
 		     "${_mh_cache[@]}" )
       fi
       ;;