* 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 e334ef972442c30c4a9ec865b0621aacf860187b..1c1c62bb1b06bf833cd7e22bbc1cf98b2a5c715c 100644 (file)
--- 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 c91bcd77195420e7786aad92df29634c1de08beb..7194813422abad7382220c6d0250c5c66029044e 100644 (file)
--- 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