Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5346a76..a3973ce 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-26 00:23:46  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-view.el (mm-inline-text): Insert directly if decoded.
+       * mml.el (autoload): Typo.
+
 2000-04-25 22:46:36  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * mml.el (mml-preview): Set up posting-charset.

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index b6ebfd0..b4a32e0 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -160,11 +160,12 @@
                  (vcard-parse-string (mm-get-part handle)
                                      'vcard-standard-filter))))))
      (t
-      (setq text (mm-get-part handle))
       (let ((b (point))
            (charset (mail-content-type-get
                      (mm-handle-type handle) 'charset)))
-       (insert (mm-decode-string text charset))
+       (if (eq charset 'gnus-decoded)
+           (mm-insert-part handle)
+         (insert (mm-decode-string (mm-get-part handle) charset)))
        (when (and (equal type "plain")
                   (equal (cdr (assoc 'format (mm-handle-type handle)))
                          "flowed"))

diff --git a/lisp/mml.el b/lisp/mml.el
index f020df4..188fc50 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -31,7 +31,7 @@
 (eval-and-compile
   (autoload 'message-make-message-id "message")
   (autoload 'gnus-setup-posting-charset "gnus-msg")
-  (audoload 'message-fetch-field "message")
+  (autoload 'message-fetch-field "message")
   (autoload 'message-posting-charset "message"))
 
 (defvar mml-generate-multipart-alist nil