From: okada <okada>
Date: Mon, 21 Jan 2002 19:52:24 +0000 (+0000)
Subject: * wl-message.el (wl-message-buffer-prefetch-subr):
X-Git-Tag: wl-2_9_6~21
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1caac03b132ab2fccfe7e277de73f3110e0fcf6e;p=elisp%2Fwanderlust.git

* wl-message.el (wl-message-buffer-prefetch-subr):
Fix for cancel-function-timers bug.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index b2c9771..5a73d68 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,7 +1,13 @@
 2002-01-22  Kenichi OKADA  <okada@opaopa.org>
 
+	* wl-message.el (wl-message-buffer-prefetch-subr):
+	Fix for cancel-function-timers bug.
+
+2002-01-22  Kenichi OKADA  <okada@opaopa.org>
+
 	* wl-message.el (wl-message-buffer-prefetch-next): Rewrite.
 	(wl-message-buffer-prefetch-subr): Rewrite.
+	Rename from `wl-message-buffer-prefetch'.
 
 2002-01-21  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 863c1ad..1a71e34 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -558,6 +558,15 @@ Returns non-nil if bottom of message."
 	     folder number (or count 1) summary charset))
 ;;;     cannot use for the bug of fsf-compat package (1.09).
 ;;;	(cancel-function-timers 'wl-message-buffer-prefetch-subr)
+	(if (featurep 'xemacs)
+	    (let ((p itimer-list))
+	      (while (car p)
+		(if (eq 'wl-message-buffer-prefetch-subr
+			(itimer-function (car p)))
+		    (delete-itimer (car p)))
+		(setq p (cdr p))))
+	  ;; FSF Emacs is correct
+	  (cancel-function-timers 'wl-message-buffer-prefetch-subr))
 	(run-with-idle-timer
 	 wl-message-buffer-prefetch-idle-time
 	 nil