Synch up with main trunk, and prepare the release 2.12.0.

[elisp/wanderlust.git] / wl / wl-expire.el

diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index fd11f92..b705c38 100644 (file)
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -92,12 +92,12 @@
 (defsubst wl-expire-message-p (folder number)
   "Return non-nil when a message in the FOLDER with NUMBER can be expired."
   (cond ((consp wl-summary-expire-reserve-marks)
-        (let ((mark (elmo-message-mark folder number)))
+        (let ((mark (wl-summary-message-mark folder number)))
           (not (or (member mark wl-summary-expire-reserve-marks)
                    (and wl-summary-buffer-disp-msg
                         (eq number wl-summary-buffer-current-msg))))))
        ((eq wl-summary-expire-reserve-marks 'all)
-        (not (or (elmo-message-mark folder number)
+        (not (or (wl-summary-message-mark folder number)
                  (and wl-summary-buffer-disp-msg
                       (eq number wl-summary-buffer-current-msg)))))
        ((eq wl-summary-expire-reserve-marks 'none)
@@ -125,9 +125,8 @@
           (format "Expiring (delete) %s msgs..."
                   (length delete-list))))
       (message "%s" mess)
-      (if (elmo-folder-delete-messages folder delete-list)
+      (if (elmo-folder-move-messages folder delete-list 'null)
          (progn
-           (elmo-folder-detach-messages folder delete-list)
            (wl-expire-append-log
             (elmo-folder-name-internal folder)
             delete-list nil 'delete)
@@ -199,7 +198,7 @@ If REFILE-LIST includes reserve mark message, so copy."
                ;; reserve mark message already refiled or expired
                (setq refile-list (delq msg refile-list))
              ;; reserve mark message not refiled
-             (wl-append wl-expired-alist (list 
+             (wl-append wl-expired-alist (list
                                           (cons msg-id
                                                 (elmo-folder-name-internal
                                                  dst-folder))))
@@ -224,9 +223,8 @@ If REFILE-LIST includes reserve mark message, so copy."
                  (wl-expire-delete-reserved-messages refile-list folder))
            (when refile-list
              (if (setq ret-val
-                       (elmo-folder-delete-messages folder refile-list))
+                       (elmo-folder-move-messages folder refile-list 'null))
                  (progn
-                   (elmo-folder-detach-messages folder refile-list)
                    (wl-expire-append-log
                     (elmo-folder-name-internal folder)
                     refile-list nil 'delete))))))
@@ -693,7 +691,6 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
              (wl-summary-delete-messages-on-buffer delete-list deleting-info)
              (wl-summary-folder-info-update)
              (wl-summary-set-message-modified)
-             (wl-summary-set-mark-modified)
              (sit-for 0)
              (set-buffer-modified-p nil))
            (wl-expired-alist-save))