Prepare for 2.10.1.

[elisp/wanderlust.git] / wl / wl-addrmgr.el

diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el
index 35ba567..9bc6ee8 100644 (file)
--- a/wl/wl-addrmgr.el
+++ b/wl/wl-addrmgr.el
@@ -365,7 +365,7 @@ Return nil if no ADDRESS exists."
   (let ((draft-buffer wl-addrmgr-draft-buffer))
     (if (and draft-buffer
             (buffer-live-p draft-buffer)
-            (null (get-buffer-window draft-buffer)))
+            (null (get-buffer-window draft-buffer 'visible)))
        (switch-to-buffer draft-buffer)
       (unless (one-window-p)
        (delete-window)))
@@ -622,8 +622,8 @@ Return nil if no ADDRESS exists."
     (when (or (null wl-addrmgr-draft-buffer)
              (not (buffer-live-p wl-addrmgr-draft-buffer)))
       (setq wl-addrmgr-draft-buffer (save-window-excursion
-                                  (wl-draft)
-                                  (current-buffer))))
+                                     (call-interactively 'wl-draft)
+                                     (current-buffer))))
     (with-current-buffer wl-addrmgr-draft-buffer
       (setq from (std11-field-body "From"))
       (if from