* elmo-msgdb.el (elmo-msgdb-list-messages): Undo last change.

[elisp/wanderlust.git] / elmo / elmo-dop.el

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index b826d07..6ce80f9 100644 (file)
--- 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,20 @@ 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-folder-list-messages folder nil 'in-msgdb))
+       (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 +309,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