X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-util.el;h=b40d735cdb41e77085fd2eafc9bc256f51aa2263;hb=4c3f56d75a954e8a1904bd767f2b544f5de57684;hp=b4bbdf2b5ac12eaa930036a9ae16f25d62d3bae5;hpb=b41f5e89f2ea53604f274d09c7f2ba83d83a74ef;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-util.el b/wl/wl-util.el
index b4bbdf2..b40d735 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -542,9 +542,11 @@ that `read' can handle, whenever this is possible."
 (defun wl-current-message-buffer ()
   (when (buffer-live-p wl-current-summary-buffer)
     (with-current-buffer wl-current-summary-buffer
-      (car (wl-message-buffer-display wl-summary-buffer-elmo-folder
-				      (wl-summary-message-number)
-				      'mime)))))
+      (or wl-message-buffer
+	  (and (wl-summary-message-number)
+	       (car (wl-message-buffer-display wl-summary-buffer-elmo-folder
+					       (wl-summary-message-number)
+					       'mime)))))))
 
 (defmacro wl-kill-buffers (regexp)
   (` (mapcar (function