* acap.el (acap-arrival-filter): Use (delete-char (- X)) instead of

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

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index fcd6015..734479b 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -43,19 +43,19 @@ Automatically loaded/saved.")
 
 (defmacro elmo-make-dop-queue (fname method arguments)
   "Make a dop queue."
-  (` (vector (, fname) (, method) (, arguments))))
+  `(vector ,fname ,method ,arguments))
 
 (defmacro elmo-dop-queue-fname (queue)
   "Return the folder name string of the QUEUE."
-  (` (aref (, queue) 0)))
+  `(aref ,queue 0))
 
 (defmacro elmo-dop-queue-method (queue)
   "Return the method symbol of the QUEUE."
-  (` (aref (, queue) 1)))
+  `(aref ,queue 1))
 
 (defmacro elmo-dop-queue-arguments (queue)
   "Return the arguments of the QUEUE."
-  (` (aref (, queue) 2)))
+  `(aref ,queue 2))
 
 (defun elmo-dop-queue-append (folder method arguments)
   "Append to disconnected operation queue."
@@ -108,7 +108,7 @@ Saved queue is old version(2.6).  Clear all pending operations? ")
        len)
     (while queue-all
       (if (elmo-folder-plugged-p
-          (elmo-make-folder (elmo-dop-queue-fname (car queue-all))))
+          (elmo-get-folder (elmo-dop-queue-fname (car queue-all))))
          (setq queue (append queue (list (car queue-all)))))
       (setq queue-all (cdr queue-all)))
     (setq count (length queue))
@@ -134,7 +134,7 @@ Saved queue is old version(2.6).  Clear all pending operations? ")
                      (apply (elmo-dop-queue-method (car queue))
                             (prog1
                                 (setq folder
-                                      (elmo-make-folder
+                                      (elmo-get-folder
                                        (elmo-dop-queue-fname (car queue))))
                               (elmo-folder-open folder)
                               (unless (elmo-folder-plugged-p folder)
@@ -157,6 +157,12 @@ Saved queue is old version(2.6).  Clear all pending operations? ")
                           (not elmo-dop-flush-confirm) t)
            (progn
              (while queue
+               (when (eq (elmo-dop-queue-method (car queue))
+                         'elmo-folder-append-buffer-dop-delayed)
+                 (elmo-folder-delete-messages
+                  (elmo-dop-spool-folder
+                   (elmo-get-folder (elmo-dop-queue-fname (car queue))))
+                  (list (nth 1 (elmo-dop-queue-arguments (car queue))))))
                (setq elmo-dop-queue (delq (car queue) elmo-dop-queue))
                (setq queue (cdr queue)))
              (message "Pending operations are cleared.")
@@ -191,12 +197,13 @@ Saved queue is old version(2.6).  Clear all pending operations? ")
     (setq elmo-dop-queue new-queue)))
 
 ;;; dop spool folder
-(defmacro elmo-dop-spool-folder (folder)
+(defun elmo-dop-spool-folder (folder)
   "Return a spool folder for disconnected operations
 which is corresponded to the FOLDER."
-  (` (elmo-make-folder
-      (concat "+" (expand-file-name "spool" (elmo-folder-msgdb-path
-                                            (, folder)))))))
+  (elmo-make-folder
+   (concat "+" (expand-file-name "spool" (elmo-folder-msgdb-path folder)))
+   nil
+   (elmo-folder-mime-charset-internal folder)))
 
 (defun elmo-dop-spool-folder-append-buffer (folder flags)
   "Append current buffer content to the dop spool folder.
@@ -247,8 +254,18 @@ FOLDER is the folder structure."
        queue)
     (dolist (number numbers)
       (if (< number 0)
-         (elmo-folder-delete-messages spool-folder
-                                      (list (abs number))) ; delete from queue
+         (progn
+           ;; delete from queue
+           (elmo-folder-delete-messages spool-folder
+                                        (list (abs number)))
+           (dolist (queue elmo-dop-queue)
+             (when (and (eq (elmo-dop-queue-fname queue)
+                            (elmo-folder-name-internal folder))
+                        (eq (elmo-dop-queue-method queue)
+                            'elmo-folder-append-buffer-dop-delayed)
+                        (eq (abs number)
+                            (nth 1 (elmo-dop-queue-arguments queue))))
+               (setq elmo-dop-queue (delq queue elmo-dop-queue)))))
        (setq queue (cons number queue))))
     (when queue
       (elmo-dop-queue-append folder 'elmo-folder-delete-messages-dop-delayed
@@ -311,15 +328,10 @@ FOLDER is the folder structure."
     (cons (+ max-num spool-length) (+ (length number-list) spool-length))))
 
 (defun elmo-folder-next-message-number-dop (folder)
-  (let ((number-list (elmo-folder-list-messages folder nil 'in-msgdb))
-       (spool-folder (elmo-dop-spool-folder folder))
-       spool-length
-       max-num)
-    (setq spool-length (or (if (elmo-folder-exists-p spool-folder)
-                              (car (elmo-folder-status spool-folder)))
-                          0))
-    (setq max-num (if number-list (apply #'max number-list) 0))
-    (+ max-num spool-length)))
+  (let ((spool-folder (elmo-dop-spool-folder folder)))
+    (- (+ 1 (elmo-max-of-list (or (elmo-folder-list-messages
+                                  spool-folder)
+                                 '(0)))))))
 
 ;;; Delayed operation (executed at online status).
 (defun elmo-folder-append-buffer-dop-delayed (folder flag number set-number)
@@ -338,11 +350,15 @@ FOLDER is the folder structure."
                              (t
                               (list flag)))))
        (when (or (condition-case nil
-                     (elmo-folder-append-buffer folder flags set-number)
+                     (let ((new-num (elmo-folder-next-message-number folder)))
+                       (prog1
+                           (elmo-folder-append-buffer folder flags set-number)
+                         (elmo-emit-signal 'message-number-changed
+                                           folder (- number) new-num)))
                    (error))
                  ;; Append failed...
                  (elmo-folder-append-buffer
-                  (elmo-make-folder elmo-lost+found-folder)
+                  (elmo-get-folder elmo-lost+found-folder)
                   flags))
          (elmo-folder-delete-messages spool-folder (list number)))))
     ;; ignore failure (already dequed)