X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-multi.el;h=a4d0da59ef99dfa50b11bf475366e7d1124525a3;hb=d702b4b970138b3b2ba6269407c7f6f53aaed6f1;hp=6ab6ef3ce4120c2d4967ab1c552113c24d25b7ef;hpb=51f9787799e1f8a5ad1f9cde0fd99489dae071c3;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 6ab6ef3..a4d0da5 100644
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -76,7 +76,7 @@
   (expand-file-name (elmo-replace-string-as-filename
 		     (elmo-folder-name-internal folder))
 		    (expand-file-name "multi"
-				      elmo-msgdb-dir)))
+				      elmo-msgdb-directory)))
 
 (luna-define-method elmo-folder-newsgroups ((folder elmo-multi-folder))
   (delq nil
@@ -104,13 +104,6 @@
       (setq children (cdr children)))
     match))
 
-(luna-define-method elmo-message-use-cache-p ((folder elmo-multi-folder)
-					     number)
-  (elmo-message-use-cache-p
-   (nth (- (/ number (elmo-multi-folder-divide-number-internal folder)) 1)
-	(elmo-multi-folder-children-internal folder))
-   (% number (elmo-multi-folder-divide-number-internal folder))))
-
 (luna-define-method elmo-message-folder ((folder elmo-multi-folder)
 					 number)
   (nth (- (/ number (elmo-multi-folder-divide-number-internal folder)) 1)
@@ -244,7 +237,7 @@
 	(elmo-folder-set-msgdb-internal folder
 					(elmo-msgdb-append
 					 (elmo-folder-msgdb folder)
-					 append-msgdb t))
+					 append-msgdb))
 	(length to-be-deleted))
     0))
 
@@ -326,7 +319,9 @@
 				      numbers))))
     (while flds
       (setq nums (elmo-folder-diff (car flds) (car num-list))
-	    nums (cons (elmo-diff-unread nums) (elmo-diff-all nums)))
+	    nums (cons (or (elmo-diff-unread nums)
+			   (elmo-diff-new nums))
+		       (elmo-diff-all nums)))
       (setq diffs (nconc diffs (list nums)))
       (setq count (+ 1 count))
       (setq num-list (cdr num-list))
@@ -545,8 +540,9 @@
 			  (+
 			   (* (elmo-multi-folder-divide-number-internal
 			       folder) cur-number) x)))
-		       (elmo-folder-search
-			(car flds) condition)))))
+		       (ignore-errors
+			 (elmo-folder-search
+			  (car flds) condition))))))
       (when numlist
 	(setq numlist-list (cdr numlist-list)))
       (setq flds (cdr flds)))
@@ -564,7 +560,7 @@
 (luna-define-method elmo-message-file-name ((folder elmo-multi-folder) number)
   (let ((pair (elmo-multi-real-folder-number folder number)))
     (elmo-message-file-name (car pair) (cdr pair))))
-  
+
 (luna-define-method elmo-folder-plugged-p ((folder elmo-multi-folder))
   (let ((flds (elmo-multi-folder-children-internal folder)))
     (catch 'plugged