Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d94b6ef..619bcf0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-08 22:34:19  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-supersede): Use mime-to-mml.
+       * mm-decode.el (mm-insert-part): Test the buffer if no encoding.
+
 2000-05-08 22:34:24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-group.el (gnus-group-list-cached): Don't use

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 3c9820b..90fb7f6 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -632,7 +632,10 @@ external if displayed external."
     (save-excursion
       (if (member (mm-handle-media-supertype handle) '("text" "message"))
          (with-temp-buffer
-           (if (eq (mm-handle-encoding handle) '8bit)
+           (if (eq (or (mm-handle-encoding handle)
+                       (with-current-buffer (mm-handle-buffer handle)
+                         (mm-body-7-or-8)))
+                   '8bit)
                ;; Emacs MULE can not handle some 8bit characters in 
                ;; multibyte character!!
                (let ((text (with-current-buffer