X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-nmz.el;h=e690a8eb401e1112cbebbca31a7273aad57d385c;hb=9e39553b80115a949a7f04ddced4459a7797f8bd;hp=1b210ff123a6a6cf69b46be143b8ecc0e9825d16;hpb=51f9787799e1f8a5ad1f9cde0fd99489dae071c3;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el
index 1b210ff..e690a8e 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"
@@ -90,7 +92,7 @@
   (expand-file-name
    (elmo-replace-string-as-filename
     (elmo-folder-name-internal folder))
-   (expand-file-name "nmz" elmo-msgdb-dir)))
+   (expand-file-name "nmz" elmo-msgdb-directory)))
 
 (defun elmo-nmz-msgdb-create-entity (folder number)
   "Create msgdb entity for the message in the FOLDER with NUMBER."
@@ -173,7 +175,7 @@
 							 numbers
 							 &optional
 							 start-number)
-  (let ((temp-dir (elmo-folder-make-temp-dir folder))
+  (let ((temp-dir (elmo-folder-make-temporary-directory folder))
 	(cur-number (if start-number 0)))
     (dolist (number numbers)
       (elmo-add-name-to-file
@@ -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)