From d063889e4c4d5d3caa891d88fad25a660c54d2f1 Mon Sep 17 00:00:00 2001
From: Christophe Troestler <Christophe.Troestler@umons.ac.be>
Date: Sat, 7 May 2016 13:12:11 +0200
Subject: [PATCH] Set mu4e-compose-format-flowed to nil by default

Requested by Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> not to disturb
existing users.
---
 mu4e/mu4e-compose.el |  7 ++++---
 mu4e/mu4e.texi       | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 3998b3f3..963aef69 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -143,7 +143,7 @@ Also see `mu4e-context-policy'."
   :safe 'symbolp
   :group 'mu4e-compose))
 
-(defcustom mu4e-compose-format-flowed t
+(defcustom mu4e-compose-format-flowed nil
   "Whether to compose messages to be sent as format=flowed (or
    with long lines if `use-hard-newlines' is set to nil).  The
    variable `fill-flowed-encode-column' lets you customize the
@@ -334,7 +334,7 @@ by blank lines.  If `use-hard-newlines' is not enabled, this
 simply executes `fill-paragraph'."
   ;; Inspired by https://www.emacswiki.org/emacs/UnfillParagraph
   (interactive (progn (barf-if-buffer-read-only) '(t)))
-  (if use-hard-newlines
+  (if mu4e-compose-format-flowed
       (let ((fill-column (point-max))
 	    (use-hard-newlines nil)); rfill "across" hard newlines
 	(fill-paragraph nil region))
@@ -393,7 +393,8 @@ simply executes `fill-paragraph'."
       '(menu-item "Format=flowed" mu4e-toggle-use-hard-newlines
 		  :button (:toggle . use-hard-newlines)
 		  :help "Toggle format=flowed"
-		  :visible (eq major-mode 'mu4e-compose-mode))
+		  :visible (eq major-mode 'mu4e-compose-mode)
+		  :enable mu4e-compose-format-flowed)
       'sep)
 
     ;; setup the fcc-stuff, if needed
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index cd26ab25..4ce797fd 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -3841,15 +3841,23 @@ devices) and here's the RFC with all the details:
 @url{http://www.ietf.org/rfc/rfc2646.txt}.
 
 Since version 0.9.17, @t{mu4e} send emails with @t{format=flowed} by
-default.  The transformation of your message into the proper format is
+setting
+
+@lisp
+(setq mu4e-compose-format-flowed t)
+@end lisp
+
+in your Emacs init file (@file{~/.emacs} or @file{~/.emacs.d/init.el}).
+The transformation of your message into the proper format is
 done at the time of sending.  In order to happen properly, you should
 write each paragraph of your message of as a long line (i.e. without
 carriage return).  If you introduce unwanted newlines in your paragraph,
 use @kbd{M-q} to reformat it as a single line.
 
-If you want to send the message with long lines but without
-@t{format=flowed} (because, say, the receiver does not understand it as
-it is the case for Google or Github), use @kbd{M-x use-hard-newlines} or
+If you want to send the message with paragraphs on single lines but
+without @t{format=flowed} (because, say, the receiver does not
+understand the latter as it is the case for Google or Github), use
+@kbd{M-x use-hard-newlines} (to turn @code{use-hard-newlines} off) or
 uncheck the box @t{format=flowed} in the @t{Text} menu when composing a
 message.