Add a $forward_weed option which controls header weeding when

decode-forwarding messages.

diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index c843c545a2a7a1a53a029723af53a06011cf9f05..e010fcfa241034e79e5c27a4f97fcc061b5cdf95 100644 (file)
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -2838,6 +2838,14 @@ When <em/set/ forwarded messages included in the main body of the message
 (when <ref id="mime_forward" name="mime&lowbar;forward"> is <em/unset/) will be
 quoted using <ref id="indent_string" name="indent&lowbar;string">.
 
+<sect2>forward&lowbar;weed<label id="forward_weed">
+<p>
+Type: boolean<newline>
+Default: set
+
+When <em/set/, message headers will be weeded when forwarding a
+decoded version of the message.
+
 <sect2>hdrs<label id="hdrs">
 <p>
 Type: boolean<newline>

diff --git a/init.h b/init.h
index d7e25c085409d6e5d10b300300ddf2043dcfdb66..448f7d73ecedaba4180ad0e823bc39fae9456777 100644 (file)
--- a/init.h
+++ b/init.h
@@ -111,6 +111,8 @@ struct option_t MuttVars[] = {
   { "force_name",      DT_BOOL, R_NONE, OPTFORCENAME, 0 },
   { "forward_decode",  DT_BOOL, R_NONE, OPTFORWDECODE, 1 },
   { "forw_decode",     DT_SYN,  R_NONE, UL "forward_decode", 0 },
+  { "forward_weed",    DT_BOOL, R_NONE, OPTFORWWEEDHEADER, 1 },
+  { "forw_weed",       DT_SYN,  R_NONE, UL "forward_weed", 0 }, 
   { "forward_format",  DT_STR,  R_NONE, UL &ForwFmt, UL "[%a: %s]" },
   { "forw_format",     DT_SYN,  R_NONE, UL "forward_format", 0 },
   { "forward_quote",   DT_BOOL, R_NONE, OPTFORWQUOTE, 0 },

diff --git a/mutt.h b/mutt.h
index a2de65fd231e4238e7a1d03f35f19d5528f24034..7147468f1988fe5051d514721a24b91309f279d9 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -290,6 +290,7 @@ enum
   OPTFOLLOWUPTO,
   OPTFORCENAME,
   OPTFORWDECODE,
+  OPTFORWWEEDHEADER,
   OPTFORWQUOTE,
   OPTHDRS,
   OPTHEADER,

diff --git a/send.c b/send.c
index a0da84377425275dda069beab235c64735f5b9aa..6944438cf851e7918f71f9a3c4f5c8e3a3441244 100644 (file)
--- a/send.c
+++ b/send.c
@@ -337,7 +337,8 @@ static int include_forward (CONTEXT *ctx, HEADER *cur, FILE *out)
   if (option (OPTFORWDECODE))
   {
     cmflags |= M_CM_DECODE;
-    chflags |= CH_WEED;
+    if (option (OPTFORWWEEDHEADER))
+      chflags |= CH_WEED;
   }
   if (option (OPTFORWQUOTE))
     cmflags |= M_CM_PREFIX;