X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-bodies.el;h=347516812c98e895843ed5ca0943927cf5e5ab63;hb=6dfc02fc01a3572827f54c7cf24144e53a2687dd;hp=219c9037cef09a57abe4c9f070d56c138ee479ad;hpb=f3a4edd8317a55c9650e7e06b3b0c56a68bbc44f;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 219c903..3475168 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -109,7 +109,7 @@ If no encoding was done, nil is returned."
 	   ))))))
 
 (defun mm-long-lines-p (length)
-  "Say whether any of the lines in the buffer is longer than LINES."
+  "Say whether any of the lines in the buffer is longer than LENGTH."
   (save-excursion
     (goto-char (point-min))
     (end-of-line)
@@ -130,8 +130,9 @@ If no encoding was done, nil is returned."
 	(longp (mm-long-lines-p 1000)))
     (require 'message)
     (cond
-     ((and (not mm-use-ultra-safe-encoding)
-	   (not longp)
+     ((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)