* message.el (message-forward-make-body): Revert an early change

	because 8-bit utf-8 emails.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c32c6c..642ac4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-25  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-forward-make-body): Revert an early change
+       because 8-bit utf-8 emails.
+
 2002-09-25  Bj\e,Av\e(Brn Torkelsson  <torkel@acc.umu.se>
 
        * gnus-agent.el (gnus-category-line-format): Doc fixes (mostly added

diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index 3a4a4c5..56a912c 100644 (file)
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -6,15 +6,17 @@
 ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
 ;; Keywords: news, mail
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
-;; GNU General Public License for more details.
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation; either version 2, or (at your
+;; option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to

diff --git a/lisp/message.el b/lisp/message.el
index 71ec801..977368d 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5576,14 +5576,11 @@ Optional DIGEST will use digest to forward."
               (not message-forward-decoded-p))
          (insert
           (with-temp-buffer
-            (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))
+            (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 ")