From a515ca9f94ca198dbf43e67adb53721a3f3d9985 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 3 Dec 2003 22:47:41 +0000 Subject: [PATCH] Synch to Gnus 200312032205. --- lisp/ChangeLog | 5 ----- lisp/mml.el | 29 +++++++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45ad111..374dedf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,3 @@ -2003-12-03 Simon Josefsson - - * mml.el (mml-generate-mime-1): Only flow encode messages when - use-hard-newlines is set. - 2003-12-03 Katsumi Yamaoka * dns.el: Fix misplaced eval-when-compile. diff --git a/lisp/mml.el b/lisp/mml.el index 6a728d9..a2a487a 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -442,18 +442,23 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." ;; ignore 0x1b, it is part of iso-2022-jp (setq encoding (mm-body-7-or-8)))) (t - ;; Perform format=flowed filling on text/plain - ;; parts when use-hard-newlines is enabled, and - ;; there are hard newlines in the buffer (they - ;; must be present on, e.g., the headers). - (when (and use-hard-newlines (string= type "text/plain") - (text-property-any (point-min) (point-max) - 'hard 't)) - (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)))) + ;; Only perform format=flowed filling on text/plain + ;; 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))) + (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 charset (mm-encode-body charset)) (setq encoding (mm-body-encoding charset (cdr (assq 'encoding cont)))))) -- 1.7.10.4