Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db9a429..a096dbd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-16 23:31  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml.el (mml-generate-mime-1): Ignore ascii.
+
 2000-11-16 Justin Sheehy <justin@iago.org>
 
        * gnus-sum.el (gnus-summary-make-menu-bar): Fix menu items.

diff --git a/lisp/mml.el b/lisp/mml.el
index f740e24..39f9dfa 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -294,6 +294,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
              (with-temp-buffer
                (setq charset (mm-charset-to-coding-system 
                               (cdr (assq 'charset cont))))
+               (if (eq charset 'ascii) (setq charset nil))
                (cond
                 ((cdr (assq 'buffer cont))
                  (insert-buffer-substring (cdr (assq 'buffer cont))))