2001-01-20 09:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mm-util.el (mm-string-as-unibyte): New.

	* message.el (message-forward): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61f7c42..f363778 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-20 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-string-as-unibyte): New.
+
+       * message.el (message-forward): Use it.
+
 2001-01-19 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-cite-original-without-signature): Don't peel

diff --git a/lisp/message.el b/lisp/message.el
index a379a9a..abf4e1a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4366,24 +4366,18 @@ Optional DIGEST will use digest to forward."
              (insert-buffer-substring cur)
            (mml-insert-buffer cur))
        (if message-forward-show-mml
-           (let ((target (current-buffer)) tmp)
-             (with-temp-buffer
-               (mm-disable-multibyte) ;; Must copy buffer in unibyte mode
-               (setq tmp (current-buffer))
-               (set-buffer cur)
-               (mm-with-unibyte-current-buffer
-                 (set-buffer tmp)
-                 (insert-buffer-substring cur)
-                 (set-buffer cur))
-               (set-buffer tmp)
-               (mm-enable-multibyte)
-               (mime-to-mml)
-               (goto-char (point-min))
-               (when (looking-at "From ")
-                 (replace-match "X-From-Line: "))
-               (set-buffer target)
-               (insert-buffer-substring tmp)
-               (set-buffer tmp)))
+           (insert
+            (with-temp-buffer
+              (mm-disable-multibyte) ;; Must copy buffer in unibyte mode
+              (insert
+               (with-current-buffer cur
+                 (mm-string-as-unibyte (buffer-string))))
+              (mm-enable-multibyte)
+              (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 cur)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index f238a5a..5c16a2a 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -121,6 +121,7 @@
                (aset string idx to))
              (setq idx (1+ idx)))
            string)))
+     (string-as-unibyte . identity)
       )))
 
 (eval-and-compile