X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=86271da8e2a9fbf52762d3a84c8e53b133f99ce6;hp=9d6b53302df34e6ef58575e639e6ef2c776b3f5c;hb=c9f72ab0cd65f517a2047feb942ad85025c1b7e8;hpb=20392fc3c433909de76c676c235524acd96bec60 diff --git a/init.h b/init.h index 9d6b533..86271da 100644 --- a/init.h +++ b/init.h @@ -17,7 +17,6 @@ # include "sort.h" #endif -#include "buffy.h" #include "mutt.h" #ifndef _MAKEDOC @@ -791,15 +790,6 @@ struct option_t MuttVars[] = { ** This variable controls whether or not a \fTMail-Followup-To:\fP header field is ** honored when group-replying to a message. */ - {"hostname", DT_STR, R_NONE, UL &Fqdn, "" }, - /* - ** .pp - ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail - ** addresses and during generation of \fTMessage-ID:\fP headers. - ** .pp - ** Please be sure to really know what you are doing when changing this variable - ** to configure a custom domain part of Message-IDs. - */ {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" }, /* ** .pp @@ -1106,30 +1096,6 @@ struct option_t MuttVars[] = { ** to this length. A value of 0 (which is also the default) means that the ** maximum line length is determined by the terminal width and $$wrapmargin. */ - {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, "5" }, - /* - ** .pp - ** This variable configures how often (in seconds) Madmutt should look for - ** new mail. - ** .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, "" }, /* @@ -1222,15 +1188,6 @@ struct option_t MuttVars[] = { ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" }, - /* - ** .pp - ** This specifies the operating system name for the \fTUser-Agent:\fP header field. If - ** this is \fIunset\fP, it will be set to the operating system name that \fTuname(2)\fP - ** returns. If \fTuname(2)\fP fails, ``UNIX'' will be used. - ** .pp - ** It may, for example, look as: ``\fTMadmutt 1.5.9i (Linux)\fP''. - */ {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." }, /* ** .pp @@ -2980,15 +2937,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 @@ -3424,12 +3372,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 *); @@ -3438,11 +3383,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; @@ -3451,8 +3391,6 @@ struct command_t { }; struct command_t Commands[] = { - {"mailboxes", buffy_parse_mailboxes, M_MAILBOXES}, - {"unmailboxes", buffy_parse_mailboxes, M_UNMAILBOXES}, {"bind", mutt_parse_bind, 0}, {"color", mutt_parse_color, 0}, {"exec", mutt_parse_exec, 0}, @@ -3480,33 +3418,19 @@ 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} };