Synch to Gnus 200312260007.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f0ce41..be20d47 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-26  Jesper Harder  <harder@ifa.au.dk>
+
+       * mm-bodies.el (mm-body-encoding): Don't use 7bit if the body
+       contains "^From " and mm-use-ultra-safe-encoding is true.
+
 2003-12-25  Jesper Harder  <harder@ifa.au.dk>
 
        * mml1991.el (mml1991-pgg-sign): Encode and decode according to

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 810185c..3475168 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -131,6 +131,8 @@ If no encoding was done, nil is returned."
     (require 'message)
     (cond
      ((and (not longp)
+          (not (and mm-use-ultra-safe-encoding
+                    (save-excursion (re-search-forward "^From " nil t))))
           (eq bits '7bit))
       bits)
      ((and (not mm-use-ultra-safe-encoding)