(elmo-imap4-flags-to-imap): Preserve argument

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

diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 7570e5f..efaa0b4 100644 (file)
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -92,6 +92,9 @@
        folder
        (elmo-folder-list-messages folder t t))))
 
+(defun elmo-filter-folder-copy-flag-count (flag-counts)
+  (mapcar (lambda (pair) (cons (car pair) (cdr pair))) flag-counts))
+
 (luna-define-method elmo-folder-open :after ((folder elmo-filter-folder)
                                             &optional load-msgdb)
   (when load-msgdb
@@ -143,11 +146,14 @@
 (luna-define-method elmo-folder-newsgroups ((folder elmo-filter-folder))
   (elmo-folder-newsgroups (elmo-filter-folder-target-internal folder)))
 
-(luna-define-method elmo-find-fetch-strategy
-  ((folder elmo-filter-folder) entity &optional ignore-cache)
+(luna-define-method elmo-find-fetch-strategy ((folder elmo-filter-folder)
+                                             number
+                                             &optional
+                                             ignore-cache
+                                             require-entireness)
   (elmo-find-fetch-strategy
    (elmo-filter-folder-target-internal folder)
-   entity ignore-cache))
+   number ignore-cache require-entireness))
 
 (luna-define-method elmo-folder-get-primitive-list ((folder
                                                     elmo-filter-folder))
@@ -174,16 +180,30 @@
 
 (luna-define-method elmo-message-fetch ((folder elmo-filter-folder)
                                        number strategy
-                                       &optional section outbuf unseen)
-  (elmo-message-fetch
-   (elmo-filter-folder-target-internal folder)
-   number strategy section outbuf unseen))
+                                       &optional unseen section)
+  (unless unseen
+    (elmo-filter-folder-countup-message-flags folder (list number) -1))
+  (when (elmo-message-fetch (elmo-filter-folder-target-internal folder)
+                           number strategy unseen section)
+    (unless unseen
+      (elmo-filter-folder-countup-message-flags folder (list number))
+      (elmo-folder-notify-event folder 'flag-changed (list number)))
+    t))
 
 (luna-define-method elmo-folder-delete-messages ((folder elmo-filter-folder)
                                                 numbers)
-  (and (elmo-folder-delete-messages
-       (elmo-filter-folder-target-internal folder) numbers)
-       (elmo-folder-detach-messages folder numbers)))
+  (let ((flag-count (elmo-filter-folder-copy-flag-count
+                    (elmo-filter-folder-flag-count-internal folder)))
+       (messages (copy-sequence
+                  (elmo-filter-folder-number-list-internal folder)))
+       success)
+    (elmo-folder-detach-messages folder numbers)
+    (unless (setq success
+                 (elmo-folder-delete-messages
+                  (elmo-filter-folder-target-internal folder) numbers))
+      (elmo-filter-folder-set-flag-count-internal folder flag-count)
+      (elmo-filter-folder-set-number-list-internal folder messages))
+    success))
 
 (luna-define-method elmo-folder-list-messages ((folder elmo-filter-folder)
                                               &optional visible-only in-msgdb)
@@ -325,7 +345,8 @@
 (luna-define-method elmo-message-set-cached ((folder elmo-filter-folder)
                                             number cached)
   (elmo-message-set-cached
-   (elmo-filter-folder-target-internal folder) number cached))
+   (elmo-filter-folder-target-internal folder) number cached)
+  (elmo-folder-notify-event folder 'cache-changed number))
 
 (luna-define-method elmo-message-number ((folder elmo-filter-folder)
                                         message-id)
@@ -362,7 +383,8 @@
   (elmo-filter-folder-countup-message-flags folder numbers -1)
   (elmo-folder-set-flag (elmo-filter-folder-target-internal folder)
                        numbers flag is-local)
-  (elmo-filter-folder-countup-message-flags folder numbers))
+  (elmo-filter-folder-countup-message-flags folder numbers)
+  (elmo-folder-notify-event folder 'flag-changed numbers))
 
 (luna-define-method elmo-folder-unset-flag ((folder elmo-filter-folder)
                                            numbers
@@ -371,12 +393,23 @@
   (elmo-filter-folder-countup-message-flags folder numbers -1)
   (elmo-folder-unset-flag (elmo-filter-folder-target-internal folder)
                          numbers flag is-local)
-  (elmo-filter-folder-countup-message-flags folder numbers))
+  (elmo-filter-folder-countup-message-flags folder numbers)
+  (elmo-folder-notify-event folder 'flag-changed numbers))
 
 (luna-define-method elmo-message-folder ((folder elmo-filter-folder)
                                         number)
   (elmo-message-folder (elmo-filter-folder-target-internal folder) number))
 
+(luna-define-method elmo-message-field ((folder elmo-filter-folder)
+                                       number field)
+  (elmo-message-field
+   (elmo-filter-folder-target-internal folder) number field))
+
+(luna-define-method elmo-message-set-field ((folder elmo-filter-folder)
+                                           number field value)
+  (elmo-message-set-field
+   (elmo-filter-folder-target-internal folder) number field value))
+
 (luna-define-method elmo-folder-clear ((folder elmo-filter-folder)
                                       &optional keep-killed)
   (unless keep-killed
@@ -418,7 +451,10 @@
 (luna-define-method elmo-folder-detach-messages ((folder elmo-filter-folder)
                                                 numbers)
   (elmo-filter-folder-countup-message-flags folder numbers -1)
-  (elmo-list-delete numbers (elmo-filter-folder-number-list folder) #'delq))
+  (elmo-filter-folder-set-number-list-internal
+   folder
+   (elmo-list-delete numbers (elmo-filter-folder-number-list folder) #'delq))
+  t)
 
 (luna-define-method elmo-folder-length ((folder elmo-filter-folder))
   (length (elmo-filter-folder-number-list-internal folder)))