From: teranisi <teranisi>
Date: Wed, 5 Dec 2001 03:53:07 +0000 (+0000)
Subject: * elmo-nmz.el (elmo-nmz-default-index-path): Allow path list.
X-Git-Tag: wl-2_8-root~93
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3e7009df6f793f5111f5a76db905196e276afc5;p=elisp%2Fwanderlust.git

* elmo-nmz.el (elmo-nmz-default-index-path): Allow path list.
(elmo-nmz-index-alias-alist): Ditto.
(elmo-map-folder-list-message-locations): Follow the change above.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6cad408..d56070c 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-nmz.el (elmo-nmz-default-index-path): Allow path list.
+	(elmo-nmz-index-alias-alist): Ditto.
+	(elmo-map-folder-list-message-locations): Follow the change above.
+
 2001-12-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo-filter.el (elmo-folder-list-subfolders): Defined.
diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el
index 1b210ff..9a9a9fe 100644
--- a/elmo/elmo-nmz.el
+++ b/elmo/elmo-nmz.el
@@ -33,7 +33,8 @@
 (require 'mime-edit)
 
 (defcustom elmo-nmz-default-index-path "~/Mail"
-  "*Default index path for namazu."
+  "*Default index path for namazu.
+If the value is a list, all elements are used as index paths for namazu."
   :type 'directory
   :group 'elmo)
 
@@ -55,7 +56,8 @@
 (defcustom elmo-nmz-index-alias-alist nil
   "*Alist of ALIAS and INDEX-PATH."
   :type '(repeat (cons (string :tag "Alias Name")
-		       (directory :tag "Index Path")))
+		       (choice (directory :tag "Index Path")
+			       (repeat (directory :tag "Index Path")))))
   :group 'elmo)
 
 ;;; "namazu search"
@@ -220,9 +222,14 @@
 		     (list
 		      (encode-mime-charset-string
 		       (elmo-nmz-folder-pattern-internal folder)
-		       elmo-nmz-charset)
-		      (expand-file-name
-		       (elmo-nmz-folder-index-path-internal folder)))))
+		       elmo-nmz-charset))
+		     (if (listp (elmo-nmz-folder-index-path-internal folder))
+			 (mapcar
+			  'expand-file-name
+			  (elmo-nmz-folder-index-path-internal folder))
+		       (list
+			(expand-file-name
+			 (elmo-nmz-folder-index-path-internal folder))))))
       (goto-char (point-min))
       (while (not (eobp))
 	(beginning-of-line)