Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index a61c4af..841ae38 100644 (file)
--- a/init.h
+++ b/init.h
@@ -390,18 +390,6 @@ struct option_t MuttVars[] = {
    ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any
    ** unread messages.
    */
-  {"count_attachments", DT_BOOL, R_NONE, OPTCOUNTATTACH, "yes"},
-  /*
-   ** .pp
-   ** This variable controls whether attachments should be counted for $$$index_format
-   ** and its \fT%X\fP expando or not. As for scoring, this variable can be used to
-   ** selectively turn counting on or off instead of removing and re-adding rules as
-   ** prefered because counting requires full loading of messages.
-   ** .pp
-   ** If it is \fIset\fP and rules were defined via the \fTattachments\fP and/or
-   ** \fTunattachments\fP commands, counting will be done. If it is \fIunset\fP no
-   ** counting will be done regardless whether rules were defined or not.
-   */
   {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" },
   /*
    ** .pp
@@ -2983,26 +2971,6 @@ struct option_t MuttVars[] = {
    ** possibly including eventual real names.  When it is \fIunset\fP, Madmutt will
    ** override any such real names with the setting of the $realname variable.
    */
-  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "no" },
-  /*
-   ** .pp
-   ** When this variable is \fIset\fP, Madmutt will decode RFC-2047-encoded MIME 
-   ** parameters. You want to set this variable when Madmutt suggests you
-   ** to save attachments to files named like this:
-   ** .pp
-   **  \fT=?iso-8859-1?Q?file=5F=E4=5F991116=2Ezip?=\fP
-   ** .pp
-   ** When this variable is \fIset\fP interactively, the change doesn't have
-   ** the desired effect before you have changed folders.
-   ** .pp
-   ** Note that this use of RFC 2047's encoding is explicitly,
-   ** prohibited by the standard, but nevertheless encountered in the
-   ** wild.
-   ** .pp
-   ** Also note that setting this parameter will \fInot\fP have the effect 
-   ** that Madmutt \fIgenerates\fP this kind of encoding.  Instead, Madmutt will
-   ** unconditionally use the encoding specified in RFC 2231.
-   */
   {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" },
   /*
    ** .pp
@@ -3699,7 +3667,8 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
-  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" },
+  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "no" },
+  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "yes"},
   { NULL, -1, R_NONE, -1, NULL }
 };