* rfc2047.el (rfc2047-encode-message-header): Encode field by

field.
* mml.el (mml-to-mime): Use message-default-charset.
(mml-preview): Narrow to headers.
* message.el (message-send-mail): Use message-default-charset.
(message-send-news): Narrow to headers;
use message-default-charset.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c8be54..cd518f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,19 @@
+2000-05-03 11:35:15  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * rfc2047.el (rfc2047-encode-message-header): Encode field by
+       field.
+       * mml.el (mml-to-mime): Use message-default-charset.
+       (mml-preview): Narrow to headers.
+       * message.el (message-send-mail): Use message-default-charset.
+       (message-send-news): Narrow to headers; 
+       use message-default-charset.
+
 2000-05-03 08:09:14  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-bodies.el (mm-decode-content-transfer-encoding): A better junk
        detect.
        * mml.el (mml-parse-singlepart-with-multiple-charsets): Save 
-       restriciton.
+       restriction.
        (mml-parse-1): Warning message.
        (mml-preview): Disable multibyte.
 

diff --git a/lisp/message.el b/lisp/message.el
index ecc07e0..20311b6 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2262,7 +2262,8 @@ It should typically alter the sending method in some way or other."
              (message-generate-headers '(Lines)))
            ;; Remove some headers.
            (message-remove-header message-ignored-mail-headers t)
-           (mail-encode-encoded-word-buffer))
+           (let ((mail-parse-charset message-default-charset))
+             (mail-encode-encoded-word-buffer)))
          (goto-char (point-max))
          ;; require one newline at the end.
          (or (= (preceding-char) ?\n)
@@ -2420,7 +2421,9 @@ to find out how to use this."
            message-syntax-checks))
         (message-this-is-news t)
         (message-posting-charset (gnus-setup-posting-charset 
-                                  (message-fetch-field "Newsgroups")))
+                                  (save-restriction
+                                    (message-narrow-to-headers-or-head)
+                                    (message-fetch-field "Newsgroups"))))
         result)
     (if (not (message-check-news-body-syntax))
        nil
@@ -2452,7 +2455,7 @@ to find out how to use this."
                  (message-generate-headers '(Lines)))
                ;; Remove some headers.
                (message-remove-header message-ignored-news-headers t)
-               (let ((mail-parse-charset (car message-posting-charset)))
+               (let ((mail-parse-charset message-default-charset))
                  (mail-encode-encoded-word-buffer)))
              (goto-char (point-max))
              ;; require one newline at the end.

diff --git a/lisp/mml.el b/lisp/mml.el
index b9ea3e9..f667ba2 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -518,7 +518,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
   (message-encode-message-body)
   (save-restriction
     (message-narrow-to-headers-or-head)
-    (mail-encode-encoded-word-buffer)))
+    (let ((mail-parse-charset message-default-charset))
+      (mail-encode-encoded-word-buffer))))
 
 (defun mml-insert-mime (handle &optional no-markup)
   (let (textp buffer mmlp)
@@ -795,7 +796,9 @@ If RAW, don't highlight the article."
   (interactive "P")
   (let ((buf (current-buffer))
        (message-posting-charset (or (gnus-setup-posting-charset 
-                                     (message-fetch-field "Newsgroups"))
+                                     (save-restriction
+                                       (message-narrow-to-headers-or-head)
+                                       (message-fetch-field "Newsgroups")))
                                     message-posting-charset)))
     (switch-to-buffer (get-buffer-create 
                       (concat (if raw "*Raw MIME preview of "

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index be3906b..61d0f88 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -135,10 +135,7 @@ Should be called narrowed to the head of the message."
              (rfc2047-fold-region (point-min) (point-max)))
             ;; Hm.
             (t)))
-         (goto-char (point-max)))))
-    (when mail-parse-charset
-      (mm-encode-coding-region
-       (point-min) (point-max) mail-parse-charset))))
+         (goto-char (point-max)))))))
 
 (defun rfc2047-encodable-p (&optional header)
   "Say whether the current (narrowed) buffer contains characters that need encoding in headers."