* gnus-msg.el (gnus-summary-mail-forward): Use gnus-article-charset.

	* message.el (message-forward-make-body): Correctly copy
	forward-buffer.

	* rfc2047.el (rfc2047-decode-region): Don't decode us-ascii characters.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c2323d..82eee16 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-04  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-msg.el (gnus-summary-mail-forward): Use gnus-article-charset.
+
+       * message.el (message-forward-make-body): Correctly copy
+       forward-buffer.
+
+       * rfc2047.el (rfc2047-decode-region): Don't decode us-ascii characters.
+       
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (gnus-article-followup-with-original): Mark with

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 01675ce..e5c9f31 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1070,7 +1070,11 @@ For the `inline' alternatives, also see the variable
         (let ((gnus-article-reply (gnus-summary-article-number)))
           (gnus-setup-message 'forward
             (gnus-summary-select-article)
-            (let ((mail-parse-charset gnus-newsgroup-charset)
+            (let ((mail-parse-charset
+                  (or (and (gnus-buffer-live-p gnus-article-buffer)
+                           (with-current-buffer gnus-article-buffer
+                             gnus-article-charset))
+                      gnus-newsgroup-charset))
                   (mail-parse-ignored-charsets gnus-newsgroup-ignored-charsets))
               (set-buffer gnus-original-article-buffer)
               (message-forward post)))))

diff --git a/lisp/message.el b/lisp/message.el
index cdd2497..e994a2a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4976,16 +4976,19 @@ Optional DIGEST will use digest to forward."
               (not message-forward-decoded-p))
          (insert
           (with-temp-buffer
-            (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode
+            (if (with-current-buffer forward-buffer
+                  (mm-multibyte-p))
+                (insert-buffer-substring forward-buffer)
+              (mm-disable-multibyte-mule4)
               (insert
                (with-current-buffer forward-buffer
                  (mm-string-as-unibyte (buffer-string))))
-              (mm-enable-multibyte-mule4)
-              (mime-to-mml)
-              (goto-char (point-min))
-              (when (looking-at "From ")
-                (replace-match "X-From-Line: "))
-              (buffer-string)))
+              (mm-enable-multibyte-mule4))
+            (mime-to-mml)
+            (goto-char (point-min))
+            (when (looking-at "From ")
+              (replace-match "X-From-Line: "))
+            (buffer-string)))
        (save-restriction
          (narrow-to-region (point) (point))
          (mml-insert-buffer forward-buffer)

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 948e168..03ec796 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -522,6 +522,7 @@ The buffer may be narrowed."
                     (delete-region (match-beginning 0) (match-end 0)))))
          (when (and (mm-multibyte-p)
                     mail-parse-charset
+                    (not (eq mail-parse-charset 'us-ascii))
                     (not (eq mail-parse-charset 'gnus-decoded)))
            (mm-decode-coding-region b e mail-parse-charset))
          (setq b (point)))