wl*.texi: Add wl-summary-resend, wl-summary-delete.

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

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 49f1b45..afac3db 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -116,7 +116,6 @@
 ;; LIST-OF-MARKS elmo-msgdb-unread-marks 
 ;; LIST-OF-MARKS elmo-msgdb-answered-marks 
 ;; LIST-OF-MARKS elmo-msgdb-uncached-marks 
-;; elmo-msgdb-seen-save DIR OBJ
 ;; elmo-msgdb-overview-save DIR OBJ
 
 ;; elmo-msgdb-message-entity MSGDB KEY
@@ -184,7 +183,8 @@
 
 (defun elmo-msgdb-list-messages (msgdb)
   "List message numbers in the MSGDB."
-  (mapcar 'car (elmo-msgdb-get-number-alist msgdb)))
+  (mapcar 'elmo-msgdb-overview-entity-get-number
+         (elmo-msgdb-get-overview msgdb)))
 
 (defsubst elmo-msgdb-get-mark (msgdb number)
   "Get mark string from MSGDB which corresponds to the message with NUMBER."
@@ -702,11 +702,6 @@ header separator."
           elmo-msgdb-answered-cached-mark
         elmo-msgdb-answered-uncached-mark)))))
 
-(defsubst elmo-msgdb-seen-save (dir obj)
-  (elmo-object-save
-   (expand-file-name elmo-msgdb-seen-filename dir)
-   obj))
-
 (defsubst elmo-msgdb-overview-save (dir overview)
   (elmo-object-save
    (expand-file-name elmo-msgdb-overview-filename dir)
@@ -1327,10 +1322,10 @@ Return the updated INDEX."
                           (list elmo-msgdb-important-mark))))))
     (when mark-regexp
       (if (eq flag 'read)
-         (dolist (number (elmo-msgdb-get-number-alist msgdb))
-           (unless (string-match mark-regexp (elmo-msgdb-get-mark
-                                              msgdb number))
-             (setq matched (cons number matched))))
+         (dolist (number (elmo-msgdb-list-messages msgdb))
+           (let ((mark (elmo-msgdb-get-mark msgdb number)))
+             (unless (and mark (string-match mark-regexp mark))
+               (setq matched (cons number matched)))))
        (dolist (elem (elmo-msgdb-get-mark-alist msgdb))
          (if (string-match mark-regexp (cadr elem))
              (setq matched (cons (car elem) matched))))))