From: yoichi <yoichi>
Date: Thu, 7 Nov 2002 11:04:42 +0000 (+0000)
Subject: * wl-summary.el (wl-summary-reedit): Hide message buffer window.
X-Git-Tag: wl-2_11_1~65
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93516ae3ff2bcfd1bf2190631a49e39045f05500;p=elisp%2Fwanderlust.git

* wl-summary.el (wl-summary-reedit): Hide message buffer window.
Do not delete other windows.
* wl-draft.el (wl-draft-edit-string): Do not delete other windows.
(wl-draft-reedit): Switch buffer with `wl-draft-buffer-style'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1760c9c..c7ac556 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-07  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-summary.el (wl-summary-reedit): Hide message buffer window.
+	Do not delete other windows.
+	* wl-draft.el (wl-draft-edit-string): Do not delete other windows.
+	(wl-draft-reedit): Switch buffer with `wl-draft-buffer-style'.
+
 2002-11-07  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-draft.el (wl-user-agent-compose): Delete special case for
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index d2df298..3421ea6 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -619,7 +619,6 @@ Reply to author if WITH-ARG is non-nil."
 		   (buffer-substring (point) (point-max))
 		   'edit-again))
       (and to (mail-position-on-field "To"))
-      (delete-other-windows)
       (kill-buffer tmp-buf)))
   (run-hooks 'wl-draft-reedit-hook))
 
@@ -1891,9 +1890,22 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	    (switch-to-buffer buffer))
 	  (set-buffer buffer))
       (setq buffer (get-buffer-create (number-to-string number)))
+      ;; switch-buffer according to draft buffer style.
       (if wl-draft-use-frame
 	  (switch-to-buffer-other-frame buffer)
-	(switch-to-buffer buffer))
+	(case wl-draft-buffer-style
+	  (split
+	   (split-window-vertically)
+	   (other-window 1)
+	   (switch-to-buffer buffer))
+	  (keep
+	   (switch-to-buffer buffer))
+	  (full
+	   (delete-other-windows)
+	   (switch-to-buffer buffer))
+	  (t (if (functionp wl-draft-buffer-style)
+		 (funcall wl-draft-buffer-style buf-name)
+	       (error "Invalid value for wl-draft-buffer-style")))))
       (set-buffer buffer)
       (insert-file-contents-as-binary file-name)
       (let((mime-edit-again-ignored-field-regexp
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 9f64586..a5ae6fc 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -609,16 +609,15 @@ If optional USE-CACHE is non-nil, use cache if exists."
   "Re-edit current message.
 If ARG is non-nil, Supersedes message"
   (interactive "P")
+  (wl-summary-toggle-disp-msg 'off)
   (if arg
       (wl-summary-supersedes-message)
     (if (string= (wl-summary-buffer-folder-name) wl-draft-folder)
-	(if (wl-summary-message-number)
-	    (progn
-	      (wl-draft-reedit (wl-summary-message-number))
-	      (if (wl-message-news-p)
-		  (mail-position-on-field "Newsgroups")
-		(mail-position-on-field "To"))
-	      (delete-other-windows)))
+	(when (wl-summary-message-number)
+	  (wl-draft-reedit (wl-summary-message-number))
+	  (if (wl-message-news-p)
+	      (mail-position-on-field "Newsgroups")
+	    (mail-position-on-field "To")))
       (wl-draft-edit-string (wl-summary-message-string)))))
 
 (defun wl-summary-resend-bounced-mail ()