From eab121111e6ebbd58a3da65bd99b391981ba18d4 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 5 Oct 1998 13:38:31 +0000
Subject: [PATCH] 	* lisp/message.el (message-send-mail): Remove a
 misplaced 	`interactive'.

	* lisp/message.el (message-yank-original): Get back to the previous
	state.
	(message-fetch-reply-field): Ditto.
	(message-setup): Ditto.
	* lisp/gnus-msg.el (gnus-setup-message): Ditto.
---
 lisp/gnus-msg.el |    3 +--
 lisp/message.el  |   34 +++++++++++-----------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 5f3c80a..ada07d1 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -247,8 +247,7 @@ MAX-COLUMN the optional second argument if it is specified, the return value
 	   (,group gnus-newsgroup-name)
 	   (message-header-setup-hook
 	    (copy-sequence message-header-setup-hook))
-	   (message-mode-hook (copy-sequence message-mode-hook))
-	   (gnus-message-get-reply-buffer 'gnus-copy-article-buffer))
+	   (message-mode-hook (copy-sequence message-mode-hook)))
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-archive-gcc)
        (add-hook 'message-mode-hook 'gnus-configure-posting-styles)
diff --git a/lisp/message.el b/lisp/message.el
index 7dce90e..7628c44 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1174,14 +1174,11 @@ The cdr of ech entry is a function for applying the face to a region.")
 
 (defun message-fetch-reply-field (header)
   "Fetch FIELD from the message we're replying to."
-  (let ((buffer (if (functionp message-reply-buffer)
-		    (funcall message-reply-buffer)
-		  message-reply-buffer)))
-    (when (and buffer
-	       (buffer-name buffer))
-      (save-excursion
-	(set-buffer buffer)
-	(message-fetch-field header)))))
+  (when (and message-reply-buffer
+	     (buffer-name message-reply-buffer))
+    (save-excursion
+      (set-buffer message-reply-buffer)
+      (message-fetch-field header))))
 
 (defun message-set-work-buffer ()
   (if (get-buffer " *message work*")
@@ -1919,16 +1916,13 @@ This function uses `message-cite-function' to do the actual citing.
 Just \\[universal-argument] as argument means don't indent, insert no
 prefix, and don't delete any headers."
   (interactive "P")
-  (let ((modified (buffer-modified-p))
-	buffer)
+  (let ((modified (buffer-modified-p)))
     (when (and message-reply-buffer
 	       message-cite-function)
-      (setq buffer
-	    (if (functionp message-reply-buffer)
-		(funcall message-reply-buffer)
-	      message-reply-buffer))
-      (delete-windows-on buffer t)
-      (insert-buffer buffer)
+      (gnus-copy-article-buffer)
+      (setq message-reply-buffer gnus-article-copy)
+      (delete-windows-on message-reply-buffer t)
+      (insert-buffer message-reply-buffer)
       (funcall message-cite-function)
       (message-exchange-point-and-mark)
       (unless (bolp)
@@ -2266,7 +2260,6 @@ the user from the mailer."
 		  (delete-region (match-end 0)(std11-field-end))
 		  (insert (concat " " (message-make-message-id)))
 		  ))
-	      (interactive)
 	      (funcall message-send-mail-function))))
 	  (funcall message-send-mail-function))
       (kill-buffer tembuf))
@@ -3499,7 +3492,6 @@ Headers already prepared in the buffer are not modified."
 	  (nconc message-buffer-list (list (current-buffer))))))
 
 (defvar mc-modes-alist)
-(defvar gnus-message-get-reply-buffer)
 (defun message-setup (headers &optional replybuffer actions)
   (when (and (boundp 'mc-modes-alist)
 	     (not (assq 'message-mode mc-modes-alist)))
@@ -3508,11 +3500,7 @@ Headers already prepared in the buffer are not modified."
 	  mc-modes-alist))
   (when actions
     (setq message-send-actions actions))
-  (setq message-reply-buffer
-	(if (and (boundp 'gnus-message-get-reply-buffer)
-		 gnus-message-get-reply-buffer)
-	    gnus-message-get-reply-buffer
-	  replybuffer))
+  (setq message-reply-buffer replybuffer)
   (goto-char (point-min))
   ;; Insert all the headers.
   (mail-header-format
-- 
1.7.10.4