* wl-summary.el (wl-summary-goto-folder-subr): Protect current

message (the condition is borrowed from `wl-check-variables-2').
(wl-summary-redisplay-internal): Ditto.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index ff7a876..e79a2ee 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-summary.el (wl-summary-goto-folder-subr): Protect current
+       message (the condition is borrowed from `wl-check-variables-2').
+       (wl-summary-redisplay-internal): Ditto.
+
 2005-01-17  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-mime.el (wl-draft-nntp-attribute): New function.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 27c9026..506b4b1 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2514,7 +2514,8 @@ If ARG, without confirm."
              (wl-message-buffer-prefetch
               folder
               (wl-summary-message-number)
-              wl-message-buffer-prefetch-depth
+              (min wl-message-buffer-prefetch-depth
+                   (1- wl-message-buffer-cache-size))
               (current-buffer)
               wl-summary-buffer-mime-charset))
          (if mes (message "%s" mes))
@@ -4593,10 +4594,12 @@ If ARG is numeric number, decode message as following:
            (if (not wl-summary-indent-length-limit)
                (wl-horizontal-recenter)))
          (wl-highlight-summary-displaying)
-         (wl-message-buffer-prefetch-next folder num
-                                          wl-message-buffer-prefetch-depth
-                                          (current-buffer)
-                                          wl-summary-buffer-mime-charset)
+         (wl-message-buffer-prefetch-next
+          folder num
+          (min wl-message-buffer-prefetch-depth
+               (1- wl-message-buffer-cache-size))
+          (current-buffer)
+          wl-summary-buffer-mime-charset)
          (run-hooks 'wl-summary-redisplay-hook))
       (message "No message to display."))))