X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=841ae3859427edf4f6957a45fdfa982cc633a3a3;hp=273b9df4a378b6b9ecc051d13472147f86504832;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=5b365d691700e8e59f96dfa3a4c209574da29898

diff --git a/init.h b/init.h
index 273b9df..841ae38 100644
--- a/init.h
+++ b/init.h
@@ -80,9 +80,6 @@ struct option_t {
 /* build complete documentation */
 
 #ifdef _MAKEDOC
-# ifndef MIXMASTER
-#  define MIXMASTER "mixmaster"
-# endif
 # ifndef USE_SSL
 #  define USE_SSL
 # endif
@@ -393,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
@@ -1294,7 +1279,6 @@ struct option_t MuttVars[] = {
    ** DOING!\fP
    */
 #ifdef USE_HCACHE
-
   {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" },
   /*
    ** .pp
@@ -1635,7 +1619,6 @@ struct option_t MuttVars[] = {
    ** menu, attachments which cannot be decoded in a reasonable manner will
    ** be attached to the newly composed message if this option is set.
    */
-
 #ifdef USE_NNTP
   {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" },
   /*
@@ -1649,13 +1632,8 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP Only change this setting if you know what you are doing.
    */
 #endif
-
-#ifdef MIXMASTER
   {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
   /*
-   ** .pp
-   ** Availability: Mixmaster
-   **
    ** .pp
    ** This variable describes the format of a remailer line on the mixmaster
    ** chain selection screen.  The following \fTprintf(3)\fP-like sequences are 
@@ -1670,16 +1648,12 @@ struct option_t MuttVars[] = {
    */
   {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER},
   /*
-   ** .pp
-   ** Availability: Mixmaster
-   **
    ** .pp
    ** This variable contains the path to the Mixmaster binary on your
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
    */
-#endif
   {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
   /*
    ** .pp
@@ -2181,7 +2155,6 @@ struct option_t MuttVars[] = {
    */
 
   /* XXX Default values! */
-
   {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" },
   /*
    ** .pp
@@ -2998,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
@@ -3432,19 +3385,6 @@ struct option_t MuttVars[] = {
    ** ``X-Mailto-'' and the message including headers will be shown in the editor
    ** regardless of what ``$$edit_headers'' is set to.
    **/
-  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" },
-  /*
-   ** .pp
-   ** When \fIunset\fP, non MIME-compliant messages that doesn't have any
-   ** charset indication in the ``\fTContent-Type:\fP'' header field can 
-   ** be displayed (non MIME-compliant messages are often generated by old
-   ** mailers or buggy mailers like MS Outlook Express).
-   ** See also $$assumed_charset.
-   ** .pp
-   ** This option also replaces linear-white-space between encoded-word
-   ** and *text to a single space to prevent the display of MIME-encoded
-   ** ``\fTSubject:\fP'' header field from being devided into multiple lines.
-   */
   {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" },
   /*
    ** .pp
@@ -3727,6 +3667,8 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
+  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "no" },
+  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "yes"},
   { NULL, -1, R_NONE, -1, NULL }
 };