X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=init.h;h=95c5285997bc307f70f3dbf740e4a413dbfa7579;hb=58e0ddff3bd5e1b9455e8c3ebb1f4b9e7dd71920;hp=f0836200bdc9a24eb6ab7f722391727c100a0303;hpb=b6980caf7b13994c57957872876cdecc21e54a82;p=apps%2Fmadmutt.git

diff --git a/init.h b/init.h
index f083620..95c5285 100644
--- a/init.h
+++ b/init.h
@@ -778,6 +778,7 @@ struct option_t MuttVars[] = {
    ** top of threads in the thread tree.  Note that when $$hide_limited is
    ** \fIset\fP, this option will have no effect.
    */
+  {"history", DT_NUM, R_NONE, UL &HistSize, "10" },
   /*
    ** .pp
    ** This variable controls the size (in number of strings remembered) of
@@ -1104,22 +1105,6 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBNote:\fP This does not apply to IMAP mailboxes, see $$imap_mail_check.
    */
-  {"mailcap_path", DT_STR, R_NONE, UL &MailcapPath, "" },
-  /*
-   ** .pp
-   ** This variable specifies which files to consult when attempting to
-   ** display MIME bodies not directly supported by Madmutt.
-   */
-  {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will restrict possible characters in mailcap \fT%\fP expandos
-   ** to a well-defined set of safe characters.  This is the safe setting,
-   ** but we are not sure it doesn't break some more advanced MIME stuff.
-   ** .pp
-   ** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE
-   ** DOING!\fP
-   */
 #ifdef USE_HCACHE
   {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" },
   /*
@@ -2970,15 +2955,6 @@ struct option_t MuttVars[] = {
    ** Madmutt will attach the message whether or not this is the case,
    ** as long as the non-``$$reply_regexp'' parts of both messages are identical.
    */
-  {"spam_separator", DT_STR, R_NONE, UL &SpamSep, ","},
-  /*
-   ** .pp
-   ** ``$spam_separator'' controls what happens when multiple spam headers
-   ** are matched: if \fIunset\fP, each successive header will overwrite any
-   ** previous matches value for the spam label. If \fIset\fP, each successive
-   ** match will append to the previous, using ``$spam_separator'' as a
-   ** separator.
-   */
   {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" },
   /*
    ** .pp
@@ -3414,12 +3390,9 @@ 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_spam_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_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_unlists (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 *);
@@ -3428,11 +3401,6 @@ 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 *);
 static int parse_unmy_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_subscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_unsubscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-
-static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 
 struct command_t {
     const char *name;
@@ -3470,33 +3438,25 @@ struct command_t Commands[] = {
     {"unmono",              mutt_parse_unmono,     0},
     {"unscore",             mutt_parse_unscore,    0},
     {"alias",               parse_alias,           0},
-    {"alternates",          parse_alternates,      0},
     {"attachments",         parse_attachments,     0 },
     {"ignore",              parse_ignore,          0},
     {"alternative_order",   parse_list,            UL &AlternativeOrderList},
     {"auto_view",           parse_list,            UL &AutoViewList},
     {"hdr_order",           parse_list,            UL &HeaderOrderList},
     {"mime_lookup",         parse_list,            UL &MimeLookupList},
-    {"lists",               parse_lists,           0},
     {"my_hdr",              parse_my_hdr,          0},
     {"reset",               parse_set,             M_SET_RESET},
     {"set",                 parse_set,             0},
     {"toggle",              parse_set,             M_SET_INV},
     {"unset",               parse_set,             M_SET_UNSET},
     {"source",              parse_source,          0},
-    {"nospam",              parse_spam_list,       M_NOSPAM},
-    {"spam",                parse_spam_list,       M_SPAM},
-    {"subscribe",           parse_subscribe,       0},
     {"unalias",             parse_unalias,         0},
-    {"unalternates",        parse_unalternates,    0},
     {"unattachments",       parse_unattachments,   0},
     {"unignore",            parse_unignore,        0},
-    {"unlists",             parse_unlists,         0},
     {"unalternative_order", parse_unlist,          UL &AlternativeOrderList},
     {"unauto_view",         parse_unlist,          UL &AutoViewList},
     {"unhdr_order",         parse_unlist,          UL &HeaderOrderList},
     {"unmime_lookup",       parse_unlist,          UL &MimeLookupList},
     {"unmy_hdr",            parse_unmy_hdr,        0},
-    {"unsubscribe",         parse_unsubscribe,     0},
     {NULL, NULL, 0}
 };