Turn $fcc_attach into a quadoption. Closes #2528.

diff --git a/ChangeLog b/ChangeLog
index b19d7832cbb76770884d2551f64085a5cb1a434d..ed0a44c033549b2fa0974342a9552be7cc783364 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-12 21:32 +0200  Rocco Rutte  <pdmef@gmx.net>  (a9117f697b27)
+
+       * handler.c: Don't insert Content-Description/form name into reply.
+       Closes #3164.
+
+2009-06-12 18:00 +0200  Rocco Rutte  <pdmef@gmx.net>  (d7afcf9a9f76)
+
+       * ChangeLog, pgpkey.c: Allow ! suffix for pgp keys via $pgp_sign_as
+       and prompt. Closes #1928.
+
 2009-06-12 13:43 +0200  Rocco Rutte  <pdmef@gmx.net>  (ed206ad41108)
 
        * ChangeLog, commands.c, recvcmd.c: Warn before bouncing messages

diff --git a/UPDATING b/UPDATING
index 707dd07ba3bcea98e27beac8033a878f773d6017..903d464f03dc5769cc12f5a205cbc16f9c5a3281 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,7 @@ The keys used are:
   !: modified feature, -: deleted feature, +: new feature
 
 hg tip:
+  ! $fcc_attach is a quadoption now
   + $honor_disposition to honor Content-Disposition headers
   + $search_context specifies number of context lines for search results
     in pager/page-based menus

diff --git a/init.h b/init.h
index b3ed426f3fe5923860a5e696ecb6f388e9ec21a6..e9319c01244ce21df3e6d05f22c5cb73c5dc23ec 100644 (file)
--- a/init.h
+++ b/init.h
@@ -726,7 +726,7 @@ struct option_t MuttVars[] = {
   ** \fBNote:\fP this variable has no effect when the $$autoedit
   ** variable is \fIset\fP.
   */
-  { "fcc_attach",      DT_BOOL, R_NONE, OPTFCCATTACH, 1 },
+  { "fcc_attach",      DT_QUAD, R_NONE, OPT_FCCATTACH, M_YES },
   /*
   ** .pp
   ** This variable controls whether or not attachments on outgoing messages

diff --git a/mutt.h b/mutt.h
index 17f8db2fcc932702819757b491f1a4ae2281d826..a0e33543126b8c711a184719295513914c9f500e 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -264,6 +264,7 @@ enum
   OPT_COPY,
   OPT_DELETE,
   OPT_FORWEDIT,
+  OPT_FCCATTACH,
   OPT_INCLUDE,
   OPT_MFUPTO,
   OPT_MIMEFWD,
@@ -337,7 +338,6 @@ enum
   OPTENCODEFROM,
   OPTENVFROM,
   OPTFASTREPLY,
-  OPTFCCATTACH,
   OPTFCCCLEAR,
   OPTFOLLOWUPTO,
   OPTFORCENAME,

diff --git a/send.c b/send.c
index 96b2d5e4dc102dd2c4b4d7fb09cce43fa5f46cf7..a04e0157c93f557aabb0615a07c5652ed2e7c42e 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1692,7 +1692,8 @@ main_loop:
       msg->content = clear_content;
 
     /* check to see if the user wants copies of all attachments */
-    if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART)
+    if (query_quadoption (OPT_FCCATTACH, _("Save attachments in Fcc?")) != M_YES &&
+       msg->content->type == TYPEMULTIPART)
     {
       if (WithCrypto
           && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 ||