* wl-summary.el (wl-summary-next-message): Use

elmo-message-accessible-p instead of elmo-message-cached-p.

* elmo.el (elmo-message-accessible-p): Renamed from
elmo-message-cached-p and rewritten.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 040822d..a391645 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo.el (elmo-message-accessible-p): Renamed from
+       elmo-message-cached-p and rewritten.
+
 2002-10-27  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo.el (elmo-folder-list-flagged): New generic function.

diff --git a/elmo/elmo.el b/elmo/elmo.el
index f4e9849..6a1fbc8 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1117,9 +1117,12 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
        folder
        (elmo-folder-expand-msgdb-path folder))))
 
-(defun elmo-message-cached-p (folder number)
-  "Get cache status of the message in the msgdb."
-  (elmo-msgdb-get-cached (elmo-folder-msgdb folder) number))
+(defun elmo-message-accessible-p (folder number)
+  "Get accessibility of the message.
+Return non-nil when message is accessible."
+  (or (elmo-folder-plugged-p folder)
+      (elmo-folder-local-p folder)
+      (elmo-msgdb-get-cached (elmo-folder-msgdb folder) number)))
 
 (defun elmo-message-set-cached (folder number cached)
   "Set cache status of the message in the msgdb.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 2a350e8..43d8712 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-next-message): Use
+       elmo-message-accessible-p instead of elmo-message-cached-p.
+
 2002-10-27  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-util.el (wl-regexp-opt): Define as an alias for elmo-regexp-opt.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 3513a77..a6db657 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4180,7 +4180,6 @@ If ARG, exit virtual folder."
          (nums (memq num (if (eq direction 'up)
                              (reverse wl-summary-buffer-number-list)
                            wl-summary-buffer-number-list)))
-         (plugged (elmo-folder-plugged-p wl-summary-buffer-elmo-folder))
          flagged-list nums2)
       (unless hereto (setq nums (cdr nums)))
       (setq nums2 nums)
@@ -4195,10 +4194,9 @@ If ARG, exit virtual folder."
                                (cdr (car cur-spec))))
                         (while nums
                           (if (and (memq (car nums) flagged-list)
-                                   (or plugged
-                                       (elmo-message-cached-p
-                                        wl-summary-buffer-elmo-folder
-                                        (car nums))))
+                                   (elmo-message-accessible-p
+                                    wl-summary-buffer-elmo-folder
+                                    (car nums)))
                               (throw 'done (car nums)))
                           (setq nums (cdr nums)))))
                    ((eq (car (car cur-spec)) 't)