* wl-message.el (wl-message-buffer-prefetch-get-next): Use while

loop instead of recursive call.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5403a31..d64334e 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,8 @@
 2002-04-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
+       * wl-message.el (wl-message-buffer-prefetch-get-next): Use while
+       loop instead of recursive call.
+
        * wl-addrmgr.el (wl-addrmgr-quit-yes): Call get-buffer-window with
        2nd argument.
 

diff --git a/wl/wl-message.el b/wl/wl-message.el
index 775758b..de5cc18 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -593,20 +593,18 @@ Returns non-nil if bottom of message."
 (defun wl-message-buffer-prefetch-get-next (folder number summary)
   (if (buffer-live-p summary)
       (with-current-buffer summary
-       (let* ((wl-summary-move-spec-plugged-alist
-               (or wl-message-buffer-prefetch-move-spec-plugged-alist
-                   wl-summary-move-spec-plugged-alist))
-              (wl-summary-move-spec-unplugged-alist
-               (or wl-message-buffer-prefetch-move-spec-unplugged-alist
-                   wl-summary-move-spec-unplugged-alist))
-              (next (funcall wl-message-buffer-prefetch-get-next-function
-                             number)))
-         (if (and next
-                  (not (wl-message-buffer-prefetch-p folder next)))
-             ;; for Multi folder
-             (wl-message-buffer-prefetch-get-next
-              folder next summary)
-           next)))))
+       (let ((wl-summary-move-spec-plugged-alist
+              (or wl-message-buffer-prefetch-move-spec-plugged-alist
+                  wl-summary-move-spec-plugged-alist))
+             (wl-summary-move-spec-unplugged-alist
+              (or wl-message-buffer-prefetch-move-spec-unplugged-alist
+                  wl-summary-move-spec-unplugged-alist))
+             (next number))
+         (while (and (setq next (funcall
+                                 wl-message-buffer-prefetch-get-next-function
+                                 next))
+                     (not (wl-message-buffer-prefetch-p folder next))))
+         next))))
 
 (defun wl-message-buffer-prefetch (folder number count
                                          &optional summary charset)