From: okada <okada>
Date: Tue, 22 Jan 2002 20:08:15 +0000 (+0000)
Subject: * wl-vars.el (wl-message-buffer-prefetch-threshold): New variable.
X-Git-Tag: wl-2_9_6~5
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5627c1734f3ab72a768a901561e01cbad71d29b9;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-message-buffer-prefetch-threshold): New variable.
* wl-message.el (wl-message-buffer-prefetch-get-next): Use
`wl-message-buffer-prefetch-threshold'.
* wl-summary.el (wl-summary-redisplay-internal): Remove
the check of `wl-message-buffer-prefetch-depth'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index b22e0bc..631ba65 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,7 +1,8 @@
 2002-01-23  Kenichi OKADA  <okada@opaopa.org>
 
+	* wl-vars.el (wl-message-buffer-prefetch-threshold): New variable.
 	* wl-message.el (wl-message-buffer-prefetch-get-next): Use
-	`wl-cache-prefetch-threshold'.
+	`wl-message-buffer-prefetch-threshold'.
 	* wl-summary.el (wl-summary-redisplay-internal): Remove
 	the check of `wl-message-buffer-prefetch-depth'.
 
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 84790b2..8bb48cc 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -580,9 +580,7 @@ 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))
-	       (threshold (or wl-cache-prefetch-threshold
-			      elmo-message-fetch-threshold)))
+	       (size (elmo-message-field folder next 'size)))
 	  (if next
 	      (cond
 	       ((not (wl-message-buffer-prefetch-p folder next))
@@ -591,8 +589,8 @@ Returns non-nil if bottom of message."
 		 folder next summary))
 	       ((and (not (elmo-message-file-p folder next))
 		     (integerp size)
-		     (integerp threshold)
-		     (>= size threshold))
+		     wl-message-buffer-prefetch-threshold
+		     (>= size wl-message-buffer-prefetch-threshold))
 		(wl-message-buffer-prefetch-get-next
 		 folder next summary))
 	       (t
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 4743b4d..5a1dc6f 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -5234,10 +5234,10 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	    (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
+					   wl-message-buffer-prefetch-depth
+					   (current-buffer)
+					   wl-summary-buffer-mime-charset)
 	  (run-hooks 'wl-summary-redisplay-hook))
       (message "No message to display."))))
 
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index ff451b8..7570978 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -413,11 +413,6 @@ when `wl-prefetch-confirm' is non-nil."
   :group 'wl-pref
   :group 'wl-setting)
 
-(defcustom wl-cache-prefetch-threshold 30000
-  "*Quit forward cache prefetching if message size is larger than this value."
-  :type 'integer
-  :group 'wl-pref)
-
 (defcustom wl-thread-insert-opened nil
   "*Non-nil forces to insert thread as opened in updating."
   :type 'boolean
@@ -1722,6 +1717,11 @@ e.x.
   :type 'number
   :group 'wl-pref)
 
+(defcustom wl-message-buffer-prefetch-threshold 30000
+  "*Quit forward cache prefetching if message size is larger than this value."
+  :type 'integer
+  :group 'wl-pref)
+
 (defcustom wl-summary-always-sticky-folder-list nil
   "All folders that match this list has sticky summary.
 Each elements are regexp of folder name."