Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffb7215..fca3c61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-10-09  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * message.el (message-send-news): Oops, missed case with no
+       "Followup-To" header...
+
+2001-10-09  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * message.el (message-send-news): Allow
+       `gnus-group-name-charset-group-alist' to affect encoding of the
+       "Newsgroups" and "Followup-To" headers.
+
 2001-10-07 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * Makefile.in (install-el): Depend on gnus-load.el.
@@ -10,7 +21,7 @@
 2001-10-07  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * message.el (message-send-news): Don't encode Followups-To when
-       gnus-group-name-charset-group-alist is ".*".  [Yuck]
+       `gnus-group-name-charset-group-alist is' ".*".  [Yuck]
 
        * gnus-util.el (gnus-decode-newsgroups): No space in newsgroup
        header. 
@@ -51,7 +62,7 @@
 2001-10-06  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * gnus-srvr.el (gnus-browse-foreign-server): Fixed bug non-nil
-       'gnus-group-name-charset-group-alist'. 
+       `gnus-group-name-charset-group-alist'. 
 
 2001-10-06 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/message.el b/lisp/message.el
index 207d888..bfc6cfb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3281,19 +3281,35 @@ This sub function is for exclusive use of `message-send-news'."
         (method (if (message-functionp message-post-method)
                     (funcall message-post-method arg)
                   message-post-method))
-        ;; BUG: We need to get the charset for each name in the
-        ;; Newsgroups and Followup-To lines.  Using the empty string
-        ;; "works" with the a default value of ".*" for
-        ;; 'gnus-group-name-charset-group-alist', but not anything
-        ;; more specifik.
-        ;; -- Par Abrahamsen <abraham@dina.kvl.dk> 2001-10-07.
-        (group-name-charset (gnus-group-name-charset method ""))
+        (newsgroups-field (save-restriction
+                            (message-narrow-to-headers-or-head)
+                            (message-fetch-field "Newsgroups")))
+        (followup-field (save-restriction
+                          (message-narrow-to-headers-or-head)
+                          (message-fetch-field "Followup-To")))
+        ;; BUG: We really need to get the charset for each name in the
+        ;; Newsgroups and Followup-To lines to allow crossposting
+        ;; between group namess with incompatible character sets.
+        ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
+        (group-field-charset
+         (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))
         (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)
@@ -3303,7 +3319,7 @@ This sub function is for exclusive use of `message-send-news'."
       (run-hooks 'message-header-hook))
     ;; Note: This check will be disabled by the ".*" default value for
     ;; gnus-group-name-charset-group-alist. -- Pa 2001-10-07.
-    (when group-name-charset
+    (when group-field-charset
       (setq message-syntax-checks
            (cons '(valid-newsgroups . disabled)
                  message-syntax-checks)))