From 54d2089dd8443965f579e4c6e2dbda4e0ebd7f2d Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 12 Oct 1998 12:45:14 +0000
Subject: [PATCH] (message-setup-hook): Delete
 `message-maybe-setup-default-charset'. Abolish
 `message-newsreader' and `message-mailer'.
 (message-user-agent): New variable. (message-reply): Use
 `make-full-mail-header-from-decoded-header' instead of
 `make-full-mail-header'. (message-followup): Use
 `make-full-mail-header-from-decoded-header' instead of
 `make-full-mail-header'. Abolish function
 `message-maybe-setup-default-charset'.

---
 lisp/message.el |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/lisp/message.el b/lisp/message.el
index e3c0872..0ca9437 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -455,8 +455,7 @@ variable isn't used."
   :group 'message-headers
   :type 'boolean)
 
-(defcustom message-setup-hook
-  '(message-maybe-setup-default-charset turn-on-mime-edit)
+(defcustom message-setup-hook '(turn-on-mime-edit)
   "Normal hook, run each time a new outgoing message is initialized.
 The function `message-setup' runs this hook."
   :group 'message-various
@@ -565,8 +564,7 @@ If stringp, use this; if non-nil, use no host name (user name only)."
 
 (defvar message-reply-buffer nil)
 (defvar message-reply-headers nil)
-(defvar message-newsreader nil)
-(defvar message-mailer nil)
+(defvar message-user-agent nil) ; XXX: This symbol is overloaded!  See below.
 (defvar message-sent-message-via nil)
 (defvar message-checksum nil)
 (defvar message-send-actions nil
@@ -632,10 +630,6 @@ actually occur."
   :group 'message-sending
   :type 'sexp)
 
-;;; XXX: This symbol is overloaded!  See below.
-(defvar message-user-agent nil
-  "String of the form of PRODUCT/VERSION.  Used for User-Agent header field.")
-
 ;; Ignore errors in case this is used in Emacs 19.
 ;; Don't use ignore-errors because this is copied into loaddefs.el.
 ;;;###autoload
@@ -3628,7 +3622,7 @@ OTHER-HEADERS is an alist of header/value pairs."
 			    (if wide to-address nil)))
 
     (setq message-reply-headers
-	  (make-full-mail-header
+	  (make-full-mail-header-from-decoded-header
 	   0 subject from date message-id references 0 0 ""))
 
     (message-setup
@@ -3754,7 +3748,7 @@ responses here are directed to other newsgroups."))
      cur)
 
     (setq message-reply-headers
-	  (make-full-mail-header
+	  (make-full-mail-header-from-decoded-header
 	   0 subject from date message-id references 0 0 ""))))
 
 
@@ -4279,19 +4273,6 @@ regexp varstr."
 ;;; @ for MIME Edit mode
 ;;;
 
-(defun message-maybe-setup-default-charset ()
-  (let ((charset
-	 (and (boundp 'gnus-summary-buffer)
-              (buffer-live-p gnus-summary-buffer)
-	      (save-excursion
-		(set-buffer gnus-summary-buffer)
-		default-mime-charset))))
-    (if charset
-	(progn
-	  (make-local-variable 'default-mime-charset)
-	  (setq default-mime-charset charset)
-	  ))))
-
 (defun message-maybe-encode ()
   (when message-mime-mode
     (run-hooks 'mime-edit-translate-hook)
-- 
1.7.10.4