X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-dop.el;h=bbacd0aa644617163000a8aa4d3d2d685a241064;hb=3e35bd5d7e240cc009ae59e6e5c3230352d73900;hp=b826d07f32a0671b7c089c68925092c29a265223;hpb=2a411790da5e15af74e1b82857c221cea02059f7;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index b826d07..bbacd0a 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -92,12 +92,12 @@ Automatically loaded/saved.")
   (unless (or (null elmo-dop-queue)
 	      (vectorp (car elmo-dop-queue)))
     (if (y-or-n-p "\
-Saved queue is old version(2.6). Clear all pending operations? ")
+Saved queue is old version(2.6).  Clear all pending operations? ")
 	(progn
 	  (setq elmo-dop-queue nil)
 	  (message "All pending operations are cleared.")
 	  (elmo-dop-queue-save))
-      (error "Please use 2.6 or earlier.")))
+      (error "Please use 2.6 or earlier")))
   (elmo-dop-queue-merge)
   (let ((queue-all elmo-dop-queue)
 	queue
@@ -135,7 +135,7 @@ Saved queue is old version(2.6). Clear all pending operations? ")
 					(elmo-dop-queue-fname (car queue))))
 			       (elmo-folder-open folder)
 			       (unless (elmo-folder-plugged-p folder)
-				 (error "Unplugged.")))
+				 (error "Unplugged")))
 			     (elmo-dop-queue-arguments (car queue)))
 		      (elmo-folder-close folder))
 		  (quit  (setq failure t))
@@ -169,7 +169,7 @@ Saved queue is old version(2.6). Clear all pending operations? ")
 	   (memq (elmo-dop-queue-method que)
 		 elmo-dop-queue-merge-method-list)
 	   (setq match-queue
-		 (car (delete 
+		 (car (delete
 		       nil
 		       (mapcar
 			(lambda (nqueue)
@@ -234,10 +234,10 @@ FOLDER is the folder structure."
 				 (car (elmo-dop-queue-arguments queue)))))))))
 
 ;;; DOP operations.
-(defsubst elmo-folder-append-buffer-dop (folder unread &optional number)
+(defsubst elmo-folder-append-buffer-dop (folder &optional flag number)
   (elmo-dop-queue-append
    folder 'elmo-folder-append-buffer-dop-delayed
-   (list unread
+   (list flag
 	 (elmo-dop-spool-folder-append-buffer
 	  folder)
 	 number)))
@@ -286,24 +286,21 @@ FOLDER is the folder structure."
 
 ;;; Execute as subsutitute for plugged operation.
 (defun elmo-folder-status-dop (folder)
-  (let* ((number-alist (elmo-msgdb-number-load
-			(elmo-folder-msgdb-path folder)))
-	 (number-list (mapcar 'car number-alist))
-	 (spool-folder (elmo-dop-spool-folder folder))
-	 spool-length
-	 (i 0)
-	 max-num)
-    (setq spool-length
-	  (or (car (if (elmo-folder-exists-p spool-folder)
-		       (elmo-folder-status spool-folder)))
-	      0))
+  (let ((number-list (elmo-msgdb-list-messages
+		      (elmo-folder-msgdb-path folder)))
+	(spool-folder (elmo-dop-spool-folder folder))
+	spool-length
+	(i 0)
+	max-num)
+    (setq spool-length (or (car (if (elmo-folder-exists-p spool-folder)
+				    (elmo-folder-status spool-folder))) 0))
     (setq max-num
 	  (or (nth (max (- (length number-list) 1) 0) number-list)
 	      0))
     (cons (+ max-num spool-length) (+ (length number-list) spool-length))))
 
 ;;; Delayed operation (executed at online status).
-(defun elmo-folder-append-buffer-dop-delayed (folder unread number set-number)
+(defun elmo-folder-append-buffer-dop-delayed (folder flag number set-number)
   (let ((spool-folder (elmo-dop-spool-folder folder))
 	failure saved dequeued)
     (with-temp-buffer
@@ -313,14 +310,17 @@ FOLDER is the folder structure."
 	  (condition-case nil
 	      (setq failure (not
 			     (elmo-folder-append-buffer
-			      folder unread set-number)))
+			      folder
+			      (if (eq flag t) nil flag) ; for compatibility
+			      set-number)))
 	    (error (setq failure t)))
 	(setq dequeued t)) ; Already deletef from queue.
       (when failure
 	;; Append failed...
 	(setq saved (elmo-folder-append-buffer
 		     (elmo-make-folder elmo-lost+found-folder)
-		     unread set-number)))
+		     (if (eq flag t) nil flag) ; for compatibility
+		     set-number)))
       (if (and (not dequeued)    ; if dequeued, no need to delete.
 	       (or (not failure) ; succeed
 		   saved))       ; in lost+found