Add $resume_draft_files option.

When set, draft files are processed the same as when resuming
postponed messages.  One use of this option is to avoid multiple
user-defined headers and signatures being added to the message.
(e.g. when -E is used repeatedly on the draft files).

diff --git a/init.h b/init.h
index e00308dceaa738ecd79f5419fec81f33b2788178..f610fffa63764d575f64093d7c8d14a32f6cc3a7 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2461,6 +2461,15 @@ struct option_t MuttVars[] = {
   ** (possibly undeleted) message whenever a command that modifies the
   ** current message is executed.
   */
+  { "resume_draft_files", DT_BOOL, R_NONE, OPTRESUMEDRAFTFILES, 0 },
+  /*
+  ** .pp
+  ** If \fIset\fP, draft files (specified by \fC-H\fP on the command
+  ** line) are processed similarly to when resuming a postponed
+  ** message.  Recipients are not prompted for; send-hooks are not
+  ** evaluated; no alias expansion takes place; user-defined headers
+  ** and signatures are not added to the message.
+  */
   { "reverse_alias",   DT_BOOL, R_BOTH, OPTREVALIAS, 0 },
   /*
   ** .pp

diff --git a/mutt.h b/mutt.h
index 11313329930c5cd95ef301649dc1a7e678a1de7c..a290fa64e6c9958c32dea65775e5f6f50e59404a 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -418,6 +418,7 @@ enum
   OPTREFLOWTEXT,
   OPTREPLYSELF,
   OPTRESOLVE,
+  OPTRESUMEDRAFTFILES,
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

diff --git a/send.c b/send.c
index b986578a765d1a250a1b8e9fba8765d569756ad6..d4ac0377c7ee666bfbecaca4199cf460311fc34e 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1287,7 +1287,8 @@ ci_send_message (int flags,               /* send mode */
     msg->env->from = set_reverse_name (cur->env);
   }
 
-  if (! (flags & (SENDPOSTPONED|SENDRESEND)))
+  if (! (flags & (SENDPOSTPONED|SENDRESEND)) &&
+      ! ((flags & SENDDRAFTFILE) && option (OPTRESUMEDRAFTFILES)))
   {
     if ((flags & (SENDREPLY | SENDFORWARD)) && ctx &&
        envelope_defaults (msg->env, ctx, cur, flags) == -1)