Synch up with main trunk and so on.

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

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 644f403..10fb1ba 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -182,9 +182,10 @@ Return value is a cons cell of NEWS and MESSAGES.")
 (luna-define-generic elmo-folder-status (folder)
   "Returns a cons cell of (MAX-NUMBER . MESSAGES) in the FOLDER.")
 
-(defun elmo-folder-list-messages (folder)
-  "Return a list of message numbers contained in FOLDER."
-  (let ((list (elmo-folder-list-messages-internal folder))
+(defun elmo-folder-list-messages (folder &optional visible-only)
+  "Return a list of message numbers contained in FOLDER.
+If optional VISIBLE-ONLY is non-nil, killed messages are not listed."
+  (let ((list (elmo-folder-list-messages-internal folder visible-only))
        (killed (elmo-folder-killed-list-internal folder))
        numbers)
     (setq numbers
@@ -227,7 +228,8 @@ IMPORTANT-MARK is the important mark."
                    (car x))))
             (elmo-msgdb-get-mark-alist (elmo-folder-msgdb folder)))))))
 
-(luna-define-generic elmo-folder-list-messages-internal (folder)
+(luna-define-generic elmo-folder-list-messages-internal (folder &optional
+                                                               visible-only)
   ;; Return a list of message numbers contained in FOLDER.
   ;; Return t if the message list is not available.
   )
@@ -1030,7 +1032,8 @@ NEW-MARK, UNREAD-CACHED-MARK, READ-UNCACHED-MARK, and IMPORTANT-MARK
 are mark strings for new messages, unread but cached messages,
 read but not cached messages, and important messages.
 If optional IGNORE-MSGDB is non-nil, current msgdb is thrown away except
-read mark status.
+read mark status. If IGNORE-MSGDB is 'visible-only, only visible messages
+are thrown away and synchronized.
 
 Return a list of
 \(NEW-MSGDB DELETE-LIST CROSSED\)
@@ -1057,7 +1060,8 @@ CROSSED is cross-posted message number."
                            (concat important-mark read-uncached-mark))
                           seen-list))
          ;; Make killed list as nil.
-         (elmo-folder-set-killed-list-internal folder nil)
+         (unless (eq ignore-msgdb 'visible-only)
+           (elmo-folder-set-killed-list-internal folder nil))
          (elmo-folder-set-msgdb-internal folder
                                          (elmo-msgdb-clear))))
     (elmo-folder-check folder)
@@ -1066,7 +1070,9 @@ CROSSED is cross-posted message number."
          (message "Checking folder diff...")
          ;; TODO: killed list is loaded in elmo-folder-open and
          ;; list-messages use internal killed-list-folder.
-         (setq diff (elmo-list-diff (elmo-folder-list-messages folder)
+         (setq diff (elmo-list-diff (elmo-folder-list-messages
+                                     folder
+                                     (eq 'visible-only ignore-msgdb))
                                     (unless ignore-msgdb
                                       (sort (mapcar 
                                              'car