Add new flag -E to modify draft/include file. (closes #3799)

Specifying -E with -i will cause mutt to directly edit the include
file.

Specifying -E with -H will cause the draft file to be regenerated from
the latest version of the email on exit.

Improve -H so that it will read (and write) multipart messages.

2 files changed, 26 insertions, 4 deletions

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index f91fc80e..14f90067 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -8304,6 +8304,7 @@ mailboxes and to send messages from the command line as well.
 <row><entry>-b</entry><entry>specify a blind carbon-copy (BCC) address</entry></row>
 <row><entry>-c</entry><entry>specify a carbon-copy (Cc) address</entry></row>
 <row><entry>-D</entry><entry>print the value of all Mutt variables to stdout</entry></row>
+<row><entry>-E</entry><entry>edit the draft (-H) or include (-i) file</entry></row>
 <row><entry>-e</entry><entry>specify a config command to be run after initialization files are read</entry></row>
 <row><entry>-f</entry><entry>specify a mailbox to load</entry></row>
 <row><entry>-F</entry><entry>specify an alternate file to read initialization commands</entry></row>
@@ -8349,14 +8350,14 @@ To compose a new message
 
 <cmdsynopsis>
 <command>mutt</command>
-<arg choice="opt"><option>-n</option></arg>
+<arg choice="opt"><option>-En</option></arg>
 <arg choice="opt"><option>-F</option>
 <replaceable>muttrc</replaceable>
 </arg>
 <arg choice="opt"><option>-c</option>
 <replaceable>address</replaceable>
 </arg>
-<arg choice="opt"><option>-i</option>
+<arg choice="opt"><option>-Hi</option>
 <replaceable>filename</replaceable>
 </arg>
 <arg choice="opt"><option>-s</option>
@@ -8395,6 +8396,24 @@ the contents of the file <quote>~/run2.dat</quote>.
 </para>
 
 <para>
+An include file passed with <literal>-i</literal> will be used as the
+body of the message.  When combined with <literal>-E</literal>, the
+include file will be directly edited during message composition.  The
+file will be modified regardless of whether the message is sent or
+aborted.
+</para>
+
+<para>
+A draft file passed with <literal>-H</literal> will be used as the
+initial header and body for the message.  Multipart messages can be
+used as a draft file.  When combined with <literal>-E</literal>, the
+draft file will be updated to the final state of the message after
+composition, regardless of whether the message is sent, aborted, or
+even postponed.  Note that if the message is sent encrypted or signed,
+the draft file will be saved that way too.
+</para>
+
+<para>
 All files passed with <literal>-a</literal> <emphasis>file</emphasis>
 will be attached as a MIME part to the message. To attach a single or
 several files, use <quote>--</quote> to separate files and recipient
diff --git a/doc/mutt.man b/doc/mutt.man
index b764c746..d29294fd 100644
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -1,7 +1,7 @@
 .\" -*-nroff-*-
 .\"
 .\"
-.\"     Copyright (C) 1996-2004 Michael R. Elkins <me@cs.hmc.edu>
+.\"     Copyright (C) 1996-2016 Michael R. Elkins <me@cs.hmc.edu>
 .\" 
 .\"     This program is free software; you can redistribute it and/or modify
 .\"     it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ mutt \- The Mutt Mail User Agent
 [\-e \fIcmd\fP] [\-F \fIfile\fP] [\-m \fItype\fP] [\-f \fIfile\fP]
 .PP
 .B mutt 
-[\-nx] 
+[\-Enx] 
 [\-e \fIcmd\fP] 
 [\-F \fIfile\fP]
 [\-H \fIfile\fP]
@@ -94,6 +94,9 @@ If mutt was compiled with +DEBUG log debugging output to ~/.muttdebug0.
 recommended.
 .IP "-D"
 Print the value of all configuration options to stdout.
+.IP "-E"
+Causes the draft file specified by -H or include file specified by -i
+to be edited during message composition.
 .IP "-e \fIcommand\fP"
 Specify a configuration command to be run after processing of initialization
 files.