* wl-message.el (wl-message-buffer-cache-add): Create new buffer

when it hits killed buffer.

* wl-message.el (wl-message-redisplay): Remove unused local
variables (Reported by NAKAJIMA Mikio <minakaji@namazu.org>).

diff --git a/wl/ChangeLog b/wl/ChangeLog
index df3ba02..d853c76 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+       
+       * wl-message.el (wl-message-buffer-cache-add): Create new buffer
+       when it hits killed buffer.
+
+       * wl-message.el (wl-message-redisplay): Remove unused local
+       variables (Reported by NAKAJIMA Mikio <minakaji@namazu.org>).
+
 2003-06-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-highlight.el (wl-highlight-summary-window): Re-calculate the

diff --git a/wl/wl-message.el b/wl/wl-message.el
index c094061..0ba6843 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -147,9 +147,12 @@ Return its cache buffer."
        (buf nil))
     (if (< len wl-message-buffer-cache-size)
        (setq buf (wl-message-buffer-create))
-      (setq buf (wl-message-buffer-cache-buffer-get
-                (nth (1- len) wl-message-buffer-cache)))
-      (setcdr (nthcdr (- len 2) wl-message-buffer-cache) nil))
+      (let ((entry (nth (1- len) wl-message-buffer-cache)))
+       (if (buffer-live-p
+            (setq buf (wl-message-buffer-cache-buffer-get entry)))
+           (setcdr (nthcdr (- len 2) wl-message-buffer-cache) nil)
+         (setq wl-message-buffer-cache (delq entry wl-message-buffer-cache))
+         (setq buf (wl-message-buffer-create)))))
     (setq wl-message-buffer-cache
          (cons (wl-message-buffer-cache-entry-make key buf)
                wl-message-buffer-cache))
@@ -420,7 +423,7 @@ Returns non-nil if bottom of message."
         message-buf
         strategy entity
         cache-used
-        header-end real-fld-num summary-win delim)
+        summary-win delim)
     (setq buffer-read-only nil)
     (setq cache-used (wl-message-buffer-display
                      folder number flag force-reload))