* wl-message.el (wl-message-exit): Check buffer existence.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index c2de1a8..6d80e5a 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-05  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-message.el (wl-message-exit): Check buffer existence.
+
 2006-10-31  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-util.el (wl-simple-display-progress): New function.

diff --git a/wl/wl-message.el b/wl/wl-message.el
index e7f2530..81338cb 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -344,6 +344,9 @@ Returns non-nil if bottom of message."
   (interactive)
   (let (summary-buf summary-win mother-buffer)
     (cond ((setq summary-buf wl-message-buffer-cur-summary-buffer)
+          (unless (buffer-live-p summary-buf)
+            (error "Summary buffer not found: %s"
+                   wl-message-buffer-cur-folder))
           (if (setq summary-win (get-buffer-window summary-buf))
               (select-window summary-win)
             (switch-to-buffer summary-buf)
@@ -351,7 +354,8 @@ Returns non-nil if bottom of message."
             (select-window (get-buffer-window summary-buf))))
          ((setq mother-buffer mime-mother-buffer)
           (kill-buffer (current-buffer))
-          (switch-to-buffer mother-buffer)))
+          (when (buffer-live-p mother-buffer)
+            (switch-to-buffer mother-buffer))))
     (run-hooks 'wl-message-exit-hook)))
 
 (defun wl-message-toggle-disp-summary ()