diff lisp/gnus/mml.el @ 111014:c6a7ac5bcef4

Merge changes made in Gnus trunk. nnimap.el: Use nnheader-message throughout. gnus.el: Autoload gnus-html-show-images. mml.el (mml-generate-mime-1): Add `mml-enable-flow' variable to add a possibility to disable format=flow encoding when using hard newlines. gnus-diary.el (gnus-diary-check-message): Fix gnus-completing-read call. gnus-sum.el (gnus-summary-refer-thread): unconditionally ignore duplicates.

--- a/lisp/gnus/mml.el	Fri Oct 15 20:16:34 2010 -0400
+++ b/lisp/gnus/mml.el	Sat Oct 16 01:55:08 2010 +0000
@@ -128,6 +128,14 @@
   :type 'boolean
   :group 'message)
 
+(defcustom mml-enable-flowed t
+  "If non-nil, enable format=flowed usage when encoding a message.
+This is only performed when filling on text/plain with hard
+newlines in the text."
+  :version "24.1"
+  :type 'boolean
+  :group 'message)
+
 (defvar mml-tweak-type-alist nil
   "A list of (TYPE . FUNCTION) for tweaking MML parts.
 TYPE is a string containing a regexp to match the MIME type.  FUNCTION
@@ -546,7 +554,8 @@
 		    ;; 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")
+		      (when (and mml-enable-flowed
+                                 (string= type "text/plain")
 				 (not (string= (cdr (assq 'sign cont)) "pgp"))
 				 (or (null (assq 'format cont))
 				     (string= (cdr (assq 'format cont))