Sync

with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65faf35..d3837a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-01  Florian Weimer  <fw@deneb.cygnus.argh.org>
+
+       * mm-bodies.el (mm-body-encoding): Always encoded if
+       `mm-use-ultra-safe-encoding' is set.
+
 2000-05-31 14:50:52  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * mml.el (ange-ftp-name-format): Typo.

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index b2b46f1..410d9f8 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -108,7 +108,7 @@ If no encoding was done, nil is returned."
   "Do Content-Transfer-Encoding and return the encoding of the current buffer."
   (let ((bits (mm-body-7-or-8)))
     (cond
-     ((eq bits '7bit)
+     ((and (not mm-use-ultra-safe-encoding) (eq bits '7bit))
       bits)
      ((and (not mm-use-ultra-safe-encoding)
           (or (eq t (cdr message-posting-charset))