(mml-generate-mime-1): Only flow encode messages when

use-hard-newlines is set.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 374dedf..45ad111 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-03  Simon Josefsson  <jas@extundo.com>
+
+       * mml.el (mml-generate-mime-1): Only flow encode messages when
+       use-hard-newlines is set.
+
 2003-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dns.el: Fix misplaced eval-when-compile.

diff --git a/lisp/mml.el b/lisp/mml.el
index 5e35f16..227141c 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -446,19 +446,15 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                    ;; parts where there either isn't a format parameter
                    ;; in the mml tag or it says "flowed" and there
                    ;; actually are hard newlines in the text.
-                   (let (use-hard-newlines)
-                     (when (and (string= type "text/plain")
-                                (or (null (assq 'format cont))
-                                    (string= (cdr (assq 'format cont))
-                                             "flowed"))
-                                (setq use-hard-newlines
-                                      (text-property-any
-                                       (point-min) (point-max) 'hard 't)))
+                   (when (and use-hard-newlines
+                              (string= type "text/plain")
+                              (or (null (assq 'format cont))
+                                  (string= (cdr (assq 'format cont)) "flowed")))
                        (fill-flowed-encode)
                        ;; Indicate that `mml-insert-mime-headers' should
                        ;; insert a "; format=flowed" string unless the
                        ;; user has already specified it.
-                       (setq flowed (null (assq 'format cont)))))
+                       (setq flowed (null (assq 'format cont))))
                    (setq charset (mm-encode-body charset))
                    (setq encoding (mm-body-encoding
                                    charset (cdr (assq 'encoding cont))))))