* wl-summary.el (wl-summary-mark-as-read-all): Bind new-mark.

(wl-summary-mark-as-read): Don't call elmo-message-set-cached.

* wl-vars.el (toplevel): Require 'elmo-msgdb.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1043bbb..c3f25f5 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-summary.el (wl-summary-mark-as-read-all): Bind new-mark.
+       (wl-summary-mark-as-read): Don't call elmo-message-set-cached.
+
+       * wl-vars.el (toplevel): Require 'elmo-msgdb.
+
 2002-09-20  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-summary.el (wl-summary-buffer-mark-modified): Abolish

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 8f46ff5..36dda43 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -817,7 +817,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
   (wl-mode-line-buffer-identification '(wl-summary-buffer-mode-line))
   (easy-menu-add wl-summary-mode-menu)
   (when wl-summary-lazy-highlight
-    (if wl-on-xemacs 
+    (if wl-on-xemacs
        (progn
          (make-local-variable 'pre-idle-hook)
          (add-hook 'pre-idle-hook 'wl-highlight-summary-window))
@@ -1649,7 +1649,7 @@ If ARG is non-nil, checking is omitted."
             (inhibit-read-only t)
             (buffer-read-only nil)
             (case-fold-search nil)
-            msg mark)
+            msg mark new-mark)
        (message "Setting all msgs as read...")
        (elmo-folder-mark-as-read folder
                                  (elmo-folder-list-unreads
@@ -2808,7 +2808,7 @@ If ARG, without confirm."
        (wl-summary-update-modeline)
        (wl-folder-update-unread
         (wl-summary-buffer-folder-name)
-                (+ wl-summary-buffer-unread-count
+        (+ wl-summary-buffer-unread-count
            wl-summary-buffer-new-count)))
       (when visible
        (unless (string= (wl-summary-persistent-mark) new-mark)
@@ -3873,7 +3873,6 @@ If ARG, exit virtual folder."
       (when (member mark (elmo-msgdb-unread-marks))
        ;; folder mark.
        (elmo-folder-mark-as-read folder (list number) no-folder-mark))
-      (elmo-message-set-cached folder number t)
       (setq new-mark (elmo-message-mark folder number))
       (unless no-modeline-update
        ;; Update unread numbers.
@@ -3882,7 +3881,7 @@ If ARG, exit virtual folder."
        (wl-summary-update-modeline)
        (wl-folder-update-unread
         (wl-summary-buffer-folder-name)
-                (+ wl-summary-buffer-unread-count
+        (+ wl-summary-buffer-unread-count
            wl-summary-buffer-new-count)))
       ;; set mark on buffer
       (when visible
@@ -3988,7 +3987,7 @@ If ARG, exit virtual folder."
   "Return non-nil when summary line format is changed."
   (not (string=
        wl-summary-buffer-line-format
-       (or (elmo-object-load (expand-file-name 
+       (or (elmo-object-load (expand-file-name
                               wl-summary-line-format-file
                               (elmo-folder-msgdb-path
                                wl-summary-buffer-elmo-folder))
@@ -4892,7 +4891,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
       (if downward
          (forward-line 1)
        (forward-line -1))
-      (setq skip (or (string-match skip-tmark-regexp 
+      (setq skip (or (string-match skip-tmark-regexp
                                   (save-excursion
                                     (wl-summary-temp-mark)))
                     (and skip-pmark-regexp

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index efe30f4..0bb77b8 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -33,6 +33,7 @@
 
 (require 'elmo-vars)
 (require 'elmo-util)
+(require 'elmo-msgdb)
 (require 'custom)
 
 ;;; Customizable Variables