`message' and `error' take format string.

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

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index e08592a..666e91f 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -84,20 +84,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))))
@@ -128,7 +129,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))
@@ -162,7 +165,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)
@@ -280,8 +283,10 @@ FOLDER is the folder structure."
         spool-length
         (i 0)
         max-num)
-    (setq spool-length (car (if (elmo-folder-exists-p spool-folder)
-                               (elmo-folder-status spool-folder))))
+    (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))