* wl-util.el (wl-current-message-buffer): If wl-message-buffer is

non-nil, use it; Don't fetch message if there's no message in the
current cursor position.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 85468d5..7116be7 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-util.el (wl-current-message-buffer): If wl-message-buffer is
+       non-nil, use it; Don't fetch message if there's no message in the
+       current cursor position.
+
 2003-11-29  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * wl-util.el (wl-region-exists-p): Use region-active-p.

diff --git a/wl/wl-util.el b/wl/wl-util.el
index b4bbdf2..b40d735 100644 (file)
--- 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