From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 17 Jan 2010 23:49:27 +0000 (-0500)
Subject: * message.el (message-setup-1): Prefer to save message-reply-buffer as a buffer.
X-Git-Tag: emacs-pretest-23.1.92~35^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f53a65903cdb66a73b919617054a69ce8042e495;p=emacs.git

* message.el (message-setup-1): Prefer to save message-reply-buffer as a buffer.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e334ef97244..1c1c62bb1b0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -5,6 +5,7 @@
 	(message-with-reply-buffer, message-widen-reply)
 	(message-yank-original): Handle non-buffer values of
 	message-reply-buffer (Bug#4080).
+	(message-setup-1): Prefer to save message-reply-buffer as a buffer.
 
 2010-01-17  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c91bcd77195..7194813422a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6320,7 +6320,11 @@ are not included."
     (condition-case nil
 	(add-to-list 'message-send-actions
 		     `(apply ',(car action) ',(cdr action)))))
-  (setq message-reply-buffer yank-action)
+  (setq message-reply-buffer
+	(if (and (consp yank-action)
+		 (eq (car yank-action) 'insert-buffer))
+	    (nth 1 yank-action)
+	  yank-action))
   (goto-char (point-min))
   ;; Insert all the headers.
   (mail-header-format