* wl-summary.el (wl-summary-collect-unread): Eliminated.

(wl-summary-mark-as-read-all): Call elmo-list-folder-unread instead of
 wl-summary-collect-unread.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index f0a1b5e..f70ec66 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-25  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-collect-unread): Eliminated.
+       (wl-summary-mark-as-read-all): Call elmo-list-folder-unread instead
+       of wl-summary-collect-unread.
+
 2001-06-21  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-vars.el (wl): Set custom-manual link as "wl-ja"

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 5d2e940..67ebaac 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -536,18 +536,6 @@
   (if wl-summary-buffer-disp-msg
       (wl-summary-redisplay)))
 
-(defun wl-summary-collect-unread (mark-alist &optional folder)
-  (let (mark ret-val)
-    (while mark-alist
-      (setq mark (cadr (car mark-alist)))
-      (and mark
-          (or (string= mark wl-summary-new-mark)
-              (string= mark wl-summary-unread-uncached-mark)
-              (string= mark wl-summary-unread-cached-mark))
-          (setq ret-val (cons (car (car mark-alist)) ret-val)))
-      (setq mark-alist (cdr mark-alist)))
-    ret-val))
-
 (defun wl-summary-count-unread (mark-alist &optional folder)
   (let ((new 0)
        (unread 0)
@@ -1716,7 +1704,7 @@ If ARG is non-nil, checking is omitted."
       (let* ((folder wl-summary-buffer-folder-name)
             (cur-buf (current-buffer))
             (msgdb wl-summary-buffer-msgdb)
-;;;         (number-alist (elmo-msgdb-get-number-alist msgdb))
+            (number-alist (elmo-msgdb-get-number-alist msgdb))
             (mark-alist (elmo-msgdb-get-mark-alist msgdb))
             (malist mark-alist)
             (inhibit-read-only t)
@@ -1724,7 +1712,14 @@ If ARG is non-nil, checking is omitted."
             (case-fold-search nil)
             msg mark)
        (message "Setting all msgs as read...")
-       (elmo-mark-as-read folder (wl-summary-collect-unread mark-alist)
+       (elmo-mark-as-read folder
+                          (elmo-list-folder-unread
+                           folder
+                           number-alist
+                           mark-alist
+                           (list wl-summary-unread-cached-mark
+                                 wl-summary-unread-uncached-mark
+                                 wl-summary-new-mark))
                           msgdb)
        (save-excursion
          (goto-char (point-min))