* elmo.el (elmo-generic-folder-append-messages): Set flag as nil

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

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index e3a6d95..fda2f92 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -88,20 +88,21 @@ Automatically loaded/saved.")
 
 (defun elmo-dop-queue-flush ()
   "Flush disconnected operations that consern plugged folders."
+  ;; obsolete
+  (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? ")
+       (progn
+         (setq elmo-dop-queue nil)
+         (message "All pending operations are cleared.")
+         (elmo-dop-queue-save))
+      (error "Please use 2.6 or earlier")))
   (elmo-dop-queue-merge)
   (let ((queue-all elmo-dop-queue)
        queue
        (count 0)
        len)
-    ;; obsolete
-    (unless (or (null queue-all)
-               (vectorp (car queue-all)))
-      (if (y-or-n-p "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.")))
     (while queue-all
       (if (elmo-folder-plugged-p
           (elmo-make-folder (elmo-dop-queue-fname (car queue-all))))
@@ -132,7 +133,9 @@ Automatically loaded/saved.")
                                 (setq folder
                                       (elmo-make-folder
                                        (elmo-dop-queue-fname (car queue))))
-                              (elmo-folder-open folder))
+                              (elmo-folder-open folder)
+                              (unless (elmo-folder-plugged-p folder)
+                                (error "Unplugged")))
                             (elmo-dop-queue-arguments (car queue)))
                      (elmo-folder-close folder))
                  (quit  (setq failure t))
@@ -166,7 +169,7 @@ Automatically loaded/saved.")
           (memq (elmo-dop-queue-method que)
                 elmo-dop-queue-merge-method-list)
           (setq match-queue
-                (car (delete 
+                (car (delete
                       nil
                       (mapcar
                        (lambda (nqueue)
@@ -231,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)))
@@ -298,7 +301,7 @@ FOLDER is the folder structure."
     (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
@@ -308,14 +311,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