* elmo.el (elmo-generic-folder-diff): Avoid byte-compile warning.

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

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 50f31d8..f729de6 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -344,15 +344,19 @@ NUMBERS is a list of message numbers to be processed.")
 FOLDER is the ELMO folder structure.
 NUMBERS is a list of message numbers to be processed.")
 
-(luna-define-generic elmo-folder-unmark-read (folder numbers)
+(luna-define-generic elmo-folder-unmark-read (folder numbers
+                                                    &optional ignore-flags)
   "Un-mark messages as read.
 FOLDER is the ELMO folder structure.
-NUMBERS is a list of message numbers to be processed.")
+NUMBERS is a list of message numbers to be processed.
+If IGNORE-FLAGS is non-nil, folder flags are not updated.")
 
-(luna-define-generic elmo-folder-mark-as-read (folder numbers)
+(luna-define-generic elmo-folder-mark-as-read (folder numbers
+                                                     &optional ignore-flags)
   "Mark messages as read.
 FOLDER is the ELMO folder structure.
-NUMBERS is a list of message numbers to be processed.")
+NUMBERS is a list of message numbers to be processed.
+If IGNORE-FLAGS is non-nil, folder flags are not updated.")
 
 (luna-define-generic elmo-folder-unmark-answered (folder numbers)
   "Un-mark messages as answered.
@@ -767,14 +771,12 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
            (elmo-progress-set 'elmo-folder-search len "Searching..."))
          (unwind-protect
              (dolist (number numbers)
-               (let ((entity (elmo-msgdb-overview-get-entity number msgdb))
-                     result)
-                 (if entity
-                     (setq result (elmo-msgdb-match-condition
-                                   condition
-                                   entity
-                                   numbers))
-                   (setq result condition))
+               (let (result)
+                 (setq result (elmo-msgdb-match-condition
+                               msgdb
+                               condition
+                               number
+                               numbers))
                  (when (elmo-filter-condition-p result)
                    (setq result (elmo-message-match-condition
                                  folder
@@ -950,14 +952,11 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
                                  0))
              (elmo-folder-set-info-hashtb folder in-db-max nil))
          (setq in-db-max cached-in-db-max)))
-      (setq unsync (if (and in-db
-                           (car in-folder))
+      (setq unsync (if (and in-db (car in-folder))
                       (- (car in-folder) in-db-max)
-                    (if (and in-folder
-                             (null in-db))
+                    (if (and in-folder (null in-db))
                         (cdr in-folder)
-                      (if (null (car in-folder))
-                          nil))))
+                      (car in-folder))))
       (setq messages (cdr in-folder))
       (if (and unsync messages (> unsync messages))
          (setq unsync messages))
@@ -1110,6 +1109,16 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
        folder
        (elmo-folder-expand-msgdb-path folder))))
 
+(defun elmo-message-set-cached (folder number cached)
+  "Set cache status of the message mark.
+FOLDER is the ELMO folder structure.
+NUMBER is a number of the message.
+If CACHED is t, message mark is set as cached."
+  (when (elmo-msgdb-set-cached
+        (elmo-folder-msgdb folder) number cached)
+    (elmo-folder-set-mark-modified-internal folder t)))
+
+
 (defun elmo-message-mark (folder number)
   "Get mark of the message.
 FOLDER is the ELMO folder structure.
@@ -1163,7 +1172,9 @@ FIELD is a symbol of the field."
                             number
                             'important))))
 
-(luna-define-method elmo-folder-unmark-read ((folder elmo-folder) numbers)
+(luna-define-method elmo-folder-unmark-read ((folder elmo-folder)
+                                            numbers
+                                            &optional ignore-flags)
   (when (elmo-folder-msgdb-internal folder)
     (dolist (number numbers)
       (elmo-msgdb-unset-status (elmo-folder-msgdb folder)
@@ -1171,7 +1182,9 @@ FIELD is a symbol of the field."
                               number
                               'read))))
 
-(luna-define-method elmo-folder-mark-as-read ((folder elmo-folder) numbers)
+(luna-define-method elmo-folder-mark-as-read ((folder elmo-folder)
+                                             numbers
+                                             &optional ignore-flag)
   (when (elmo-folder-msgdb-internal folder)
     (dolist (number numbers)
       (elmo-msgdb-set-status (elmo-folder-msgdb folder)
@@ -1587,6 +1600,7 @@ Return a hashtable for newsgroups."
 
 ;; autoloads
 (autoload 'elmo-dop-queue-flush "elmo-dop")
+(autoload 'elmo-nntp-post "elmo-nntp")
 
 (require 'product)
 (product-provide (provide 'elmo) (require 'elmo-version))