X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-localdir.el;h=4907de052e5c570264c473142e2b9b65ea7f3eb2;hb=64eb91d7fe775e78e0f1e6555b595e40f391260a;hp=f9e5c2f1235231ac6f67b0c5d4b8cacd47173dc2;hpb=3823cb47f19c37a739371e84d76f051cdcc365bd;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index f9e5c2f..4907de0 100644
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -140,10 +140,6 @@
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-localdir-folder)
 					      numbers
-					      new-mark
-					      already-mark
-					      seen-mark
-					      important-mark
 					      seen-list)
   (when numbers
     (let ((dir (elmo-localdir-folder-directory-internal folder))
@@ -172,10 +168,10 @@
 			      (if (elmo-file-cache-exists-p message-id) ; XXX
 				  (if seen
 				      nil
-				    already-mark)
+				    elmo-msgdb-unread-cached-mark)
 				(if seen
 				    nil ;;seen-mark
-				  new-mark))))
+				  elmo-msgdb-new-mark))))
 	      (setq mark-alist
 		    (elmo-msgdb-mark-append
 		     mark-alist
@@ -227,7 +223,7 @@
 
 (luna-define-method elmo-folder-append-messages :around
   ((folder elmo-localdir-folder)
-   src-folder numbers unread-marks &optional same-number)
+   src-folder numbers &optional same-number)
   (if (elmo-folder-message-file-p src-folder)
       (let ((dir (elmo-localdir-folder-directory-internal folder))
 	    (succeeds numbers)
@@ -299,7 +295,7 @@
   (let ((dir (elmo-localdir-folder-directory-internal folder)))
     (if (not (file-directory-p dir))
 	(error "No such directory: %s" dir)
-      (elmo-delete-directory dir t)
+      (elmo-delete-match-files dir "[0-9]+" t)
       t)))
 
 (luna-define-method elmo-folder-rename-internal ((folder elmo-localdir-folder)
@@ -363,12 +359,10 @@
     (message "Packing...done")
     (elmo-folder-set-msgdb-internal
      folder
-     (list (elmo-msgdb-get-overview msgdb)
-	   onum-alist
-	   new-mark-alist
-	   ;; remake hash table
-	   (elmo-msgdb-make-overview-hashtb
-	    (elmo-msgdb-get-overview msgdb))))))
+     (elmo-make-msgdb
+      (elmo-msgdb-get-overview msgdb)
+      onum-alist
+      new-mark-alist))))
 
 (luna-define-method elmo-folder-message-file-p ((folder elmo-localdir-folder))
   t)