Merge from trunk:

* elmo-localdir.el (elmo-folder-expand-msgdb-path): Correct msgdb
path for "+~/something".

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b00e621..27091e5 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-15  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * elmo-localdir.el (elmo-folder-expand-msgdb-path): Correct msgdb
+       path for "+~/something".
+
 2003-01-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * elmo-imap4.el (elmo-imap4-fetch-read): Abolish alias.

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 2fa24e5..5f4c77f 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -91,8 +91,9 @@
     'identity
     (mapcar
      'elmo-replace-string-as-filename
-     (split-string (elmo-localdir-folder-dir-name-internal folder)
-                  "/"))
+     (split-string
+      (expand-file-name (elmo-localdir-folder-dir-name-internal folder))
+      "/"))
     "/")
    (expand-file-name ;;"localdir"
     (symbol-name (elmo-folder-type-internal folder))