From 15af5f0e1a883152fe145ff1aaec0c5c3358a7be Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 10 Oct 2001 11:34:10 +0000
Subject: [PATCH] * message.el (message-send-news): Modify the value of 
 `mime-field-encoding-method-alist' to encode newsgroup
 names.

* gnus-art.el (gnus-article-header-presentation-method): Call
 `article-decode-group-name' to decode newsgroup names.
(gnus-article-decode-hook): Default to nil.

Synch with Oort Gnus:

* gnus-group.el (gnus-group-name-charset-group-alist): Use
 `find-coding-system' for XEmacs to check whether the coding-system `utf-8'
  is available.
---
 ChangeLog          |    9 +++++++++
 lisp/ChangeLog     |    6 ++++++
 lisp/gnus-art.el   |    4 ++--
 lisp/gnus-group.el |    5 +++--
 lisp/message.el    |   15 ++++++---------
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 308b592..bc6b8c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/message.el (message-send-news): Modify the value of
+	`mime-field-encoding-method-alist' to encode newsgroup names.
+
+	* lisp/gnus-art.el (gnus-article-header-presentation-method): Call
+	`article-decode-group-name' to decode newsgroup names.
+	(gnus-article-decode-hook): Default to nil.
+
 2001-10-06 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* Makefile.in (uninstall): Add.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0618166..83642d8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-group.el (gnus-group-name-charset-group-alist): Use
+	`find-coding-system' for XEmacs to check whether the coding-system
+	`utf-8' is available.
+
 2001-10-09 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* dgnushack.el (dgnushack-compile): Detect mh-e and xml.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 042e48b..1e38b21 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -686,7 +686,7 @@ displayed by the first non-nil matching CONTENT face."
 			       (item :tag "skip" nil)
 			       (face :value default)))))
 
-(defcustom gnus-article-decode-hook '(article-decode-group-name)
+(defcustom gnus-article-decode-hook nil
   "*Hook run to decode charsets in articles."
   :group 'gnus-article-headers
   :type 'hook)
@@ -6280,7 +6280,7 @@ For example:
 
 (defun gnus-article-header-presentation-method (entity situation)
   (mime-insert-header entity)
-  )
+  (article-decode-group-name))
 
 (set-alist 'mime-header-presentation-method-alist
 	   'gnus-original-article-mode
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index d00e394..154c260 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -411,8 +411,9 @@ For example:
   :group 'gnus-charset
   :type '(repeat (cons (sexp :tag "Method") (symbol :tag "Charset"))))
 
-(defcustom gnus-group-name-charset-group-alist 
-  (if (and (fboundp 'coding-system-p) (coding-system-p 'utf-8))
+(defcustom gnus-group-name-charset-group-alist
+  (if (or (and (fboundp 'find-coding-system) (find-coding-system 'utf-8))
+	  (and (fboundp 'coding-system-p) (coding-system-p 'utf-8)))
       '((".*" . utf-8))
     nil)
   "Alist of group regexp and the charset for group names.
diff --git a/lisp/message.el b/lisp/message.el
index bfc6cfb..b4c62c9 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3295,21 +3295,18 @@ This sub function is for exclusive use of `message-send-news'."
 	  (gnus-group-name-charset method newsgroups-field))
 	 (followup-field-charset
 	  (gnus-group-name-charset method (or followup-field "")))
-;;; FIXME: Newsgroups or Followup-To fields should be treated as UTF-8.
-;;;	 (rfc2047-header-encoding-alist
-;;;	  (append (when group-field-charset
-;;;		    (list (cons "Newsgroups" group-field-charset)))
-;;;		  (when followup-field-charset
-;;;		    (list (cons "Followup-To" followup-field-charset)))
-;;;		  rfc2047-header-encoding-alist))
+	 (mime-field-encoding-method-alist
+	  (append (when group-field-charset
+		    (list (cons "Newsgroups" group-field-charset)))
+		  (when followup-field-charset
+		    (list (cons "Followup-To" followup-field-charset)))
+		  mime-field-encoding-method-alist))
 	 (message-syntax-checks
 	  (if arg
 	      (cons '(existing-newsgroups . disabled)
 		    message-syntax-checks)
 	    message-syntax-checks))
 	 (message-this-is-news t)
-;;;	 (message-posting-charset
-;;;	  (gnus-setup-posting-charset newsgroups-field))
 	 result)
     (save-restriction
       (message-narrow-to-headers)
-- 
1.7.10.4