From: kaoru <kaoru>
Date: Sun, 15 Jun 2003 15:14:05 +0000 (+0000)
Subject: * elmo-imap4.el (elmo-folder-expand-msgdb-path): Don't expand
X-Git-Tag: wl-2_10_1pre~17
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19379384bb8901a92aa2dc91c1e5ae16d50155c3;p=elisp%2Fwanderlust.git

* elmo-imap4.el (elmo-folder-expand-msgdb-path): Don't expand
mailbox (e.g. for %~/something).
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a85a60c..2130941 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,8 @@
 2003-06-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+	* elmo-imap4.el (elmo-folder-expand-msgdb-path): Don't expand
+	mailbox (e.g. for %~/something).
+
 	* elmo-msgdb.el (elmo-msgdb-overview-entity-get-extra-field):
 	Convert field-name to lower case.
 	(elmo-msgdb-overview-entity-set-extra-field): Ditto.
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index b056019..4524cbd 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1804,15 +1804,16 @@ Return nil if no complete line has arrived."
 	 (setq mailbox "inbox"))
      (if (eq (string-to-char mailbox) ?/)
 	 (setq mailbox (substring mailbox 1 (length mailbox))))
-     (expand-file-name
-      mailbox
+     ;; don't use expand-file-name (e.g. %~/something)
+     (concat
       (expand-file-name
        (or (elmo-net-folder-user-internal folder) "nobody")
        (expand-file-name (or (elmo-net-folder-server-internal folder)
 			     "nowhere")
 			 (expand-file-name
 			  "imap"
-			  elmo-msgdb-directory)))))))
+			  elmo-msgdb-directory)))
+      "/" mailbox))))
 
 (luna-define-method elmo-folder-status-plugged ((folder
 						 elmo-imap4-folder))