Vikas' latest version of attachment forwarding.

diff --git a/Muttrc.in b/Muttrc.in
index 70b5d8ce785220fff15fdd94e1179f801957dc48..00f868bbde0b7be09b636411c00b55e47309fa5d 100644 (file)
--- a/Muttrc.in
+++ b/Muttrc.in
@@ -74,6 +74,7 @@ macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
 # set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
 # set followup_to
 # unset force_name
+# unset forward_attachment
 # set forward_decode
 # unset forward_decrypt
 # set forward_format="[%a: %s]"

diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index bfd39a2cea06000e6e5b9b722b449f6ef07a659d..c041cbc1ea766dd7481abf03d9d656a003f58536 100644 (file)
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -2852,6 +2852,28 @@ to even if that mailbox does not exist.
 
 Also see the <ref id="record" name="&dollar;record"> variable.
 
+<sect2>forward&lowbar;attachment<label id="forward_attachment">
+<p>
+Type: boolean<newline>
+Default: unset
+
+When set, and you (tag-)forward attachments from the Attachment menu,
+Mutt creates a new message with the specified attachments <em/only/.
+<ref id="forward_format" name="&dollar;forward&lowbar;format"> is used
+to set the default subject.
+
+When unset, Mutt creates a pseudo-message comprising the tagged
+attachments and forwards that. See the section on Forwarding a message
+for details.
+
+For example: if you have a message containing a image/gif,
+application/octet-stream, or whatever attachment, you can go to the
+Attachment menu and forward ONLY that attachment to someone else.
+
+Basically, setting this variable produces the same effect as
+explicitly saving the attachment(s), composing a new message and then
+attaching the saved file(s).
+
 <sect2>forward&lowbar;decode<label id="forward_decode">
 <p>
 Type: boolean<newline>

diff --git a/recvattach.c b/recvattach.c
index b143a878a96df28d4da169c0baec222abb7d2364..855aeeefe945157d3ce84b1891c8df610f90645b 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -825,7 +825,7 @@ static void reply_attachment_list (int op, int tag, HEADER *hdr, BODY *body)
     if (mutt_prepare_edit_message (ctx, newhdr, hn) < 0)
     {
       mutt_free_header (&newhdr);
-      return;
+      goto cleanup;
     }
 
     mutt_free_envelope (&newhdr->env);
@@ -844,6 +844,8 @@ static void reply_attachment_list (int op, int tag, HEADER *hdr, BODY *body)
   if (hn->replied && !hdr->replied)
     mutt_set_flag (Context, hdr, M_REPLIED, 1);
 
+cleanup:
+
   if (ctx != Context)
   {
     mx_fastclose_mailbox (ctx);