From 765d031be8f5cee20325d198e08fed00ead8efbc Mon Sep 17 00:00:00 2001
From: okada <okada>
Date: Tue, 22 Jan 2002 19:42:55 +0000
Subject: [PATCH] * wl-message.el (wl-message-buffer-prefetch-get-next): Use
 `wl-cache-prefetch-threshold'. * wl-summary.el
 (wl-summary-redisplay-internal): Remove the check of
 `wl-message-buffer-prefetch-depth'.

---
 wl/ChangeLog     |    7 +++++++
 wl/wl-message.el |   12 ++++++++----
 wl/wl-summary.el |    6 ------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0d77141..b22e0bc 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2002-01-23  Kenichi OKADA  <okada@opaopa.org>
 
+	* wl-message.el (wl-message-buffer-prefetch-get-next): Use
+	`wl-cache-prefetch-threshold'.
+	* wl-summary.el (wl-summary-redisplay-internal): Remove
+	the check of `wl-message-buffer-prefetch-depth'.
+
+2002-01-23  Kenichi OKADA  <okada@opaopa.org>
+
 	* wl-message.el (wl-message-buffer-prefetch-get-next): Check the
 	size of article.
 	(wl-message-buffer-prefetch-subr): Remove size check.
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 8bf161c..f2720a1 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -580,7 +580,12 @@ Returns non-nil if bottom of message."
       (with-current-buffer summary
 	(let* ((next (funcall wl-message-buffer-prefetch-get-next-function
 			      number))
-	       (size (elmo-message-field folder next 'size)))
+	       (size (elmo-message-field folder next 'size))
+	       (threshold (or wl-cache-prefetch-threshold
+			      elmo-message-fetch-threshold)))
+	  (unless (and (integerp size)
+		       (integerp threshold))
+	    (debug))
 	  (if next
 	      (cond
 	       ((not (wl-message-buffer-prefetch-p folder next))
@@ -589,9 +594,8 @@ Returns non-nil if bottom of message."
 		 folder next summary))
 	       ((and (not (elmo-message-file-p folder next))
 		     (integerp size)
-		     elmo-message-fetch-threshold
-		     (>= size
-			 elmo-message-fetch-threshold))
+		     (integerp threshold)
+		     (>= size threshold))
 		(wl-message-buffer-prefetch-get-next
 		 folder next summary))
 	       (t
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 07f53fb..4743b4d 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -5234,12 +5234,6 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	    (if (not wl-summary-indent-length-limit)
 		(wl-horizontal-recenter)))
 	  (wl-highlight-summary-displaying)
-	  (when wl-message-buffer-prefetch-depth
-	    (if (not (< wl-message-buffer-prefetch-depth
-			wl-message-buffer-cache-size))
-		(error (concat
-			"`wl-message-buffer-prefetch-depth' must be smaller than "
-			"`wl-message-buffer-cache-size' - 1.")))
 	    (wl-message-buffer-prefetch-next folder num
 					     wl-message-buffer-prefetch-depth
 					     (current-buffer)
-- 
1.7.10.4