simplifications.

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index f96845e..d25f618 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1340,19 +1340,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" },
-  /*
-   ** .pp
-   ** Availability: NNTP
-   **
-   ** .pp
-   ** If \fIunset\fP, an 8-bit ``\fTSubject:\fP'' header field in a news article
-   ** will not be encoded according to RFC2047.
-   ** .pp
-   ** \fBNote:\fP Only change this setting if you know what you are doing.
-   */
-#endif
   {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
   /*
    ** .pp
@@ -1820,15 +1807,6 @@ struct option_t MuttVars[] = {
    ** keyid form to specify your key (e.g., ``\fT0x00112233\fP'').
    ** (PGP only)
    */
-  {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will automatically encode PGP/MIME signed messages as
-   ** \fTquoted-printable\fP.  Please note that unsetting this variable may
-   ** lead to problems with non-verifyable PGP signatures, so only change
-   ** this if you know what you are doing.
-   ** (PGP only)
-   */
   {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" },
   /*
    ** .pp
@@ -2784,14 +2762,6 @@ struct option_t MuttVars[] = {
    ** For example, Madmutt has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */
-  {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, "no" },
-  /*
-   ** .pp
-   ** If \fIset\fP, the signature will be included before any quoted or forwarded
-   ** text.  It is \fBstrongly\fP recommended that you do not set this variable
-   ** unless you really know what you are doing, and are prepared to take
-   ** some heat from netiquette guardians.
-   */
   {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"},
   /*
    ** .pp
@@ -3362,14 +3332,10 @@ const struct mapping_t SortKeyMethods[] = {
 
 /* functions used to parse commands in a rc file */
 
-static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_attachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unattachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_set (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_my_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -3410,8 +3376,6 @@ struct command_t Commands[] = {
     {"unscore",             mutt_parse_unscore,    0},
     {"alias",               parse_alias,           0},
     {"attachments",         parse_attachments,     0 },
-    {"ignore",              parse_ignore,          0},
-    {"hdr_order",           parse_list,            UL &HeaderOrderList},
     {"my_hdr",              parse_my_hdr,          0},
     {"reset",               parse_set,             M_SET_RESET},
     {"set",                 parse_set,             0},
@@ -3420,8 +3384,6 @@ struct command_t Commands[] = {
     {"source",              parse_source,          0},
     {"unalias",             parse_unalias,         0},
     {"unattachments",       parse_unattachments,   0},
-    {"unignore",            parse_unignore,        0},
-    {"unhdr_order",         parse_unlist,          UL &HeaderOrderList},
     {"unmy_hdr",            parse_unmy_hdr,        0},
     {NULL, NULL, 0}
 };