X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=fbae7da2f0ecbf4a162244941241d4490c2365fa;hp=e6ae39c1526ae3e882181bf7d405554cf00c3ce8;hb=75147b39ee208b0e6257bc483d96b20b1f5a7995;hpb=552847916ae6671d52db12880ee337f880cc766b diff --git a/init.h b/init.h index e6ae39c..fbae7da 100644 --- a/init.h +++ b/init.h @@ -17,7 +17,6 @@ # include "sort.h" #endif -#include "buffy.h" #include "mutt.h" #ifndef _MAKEDOC @@ -30,8 +29,6 @@ #define DT_SORT 6 /* sorting methods */ #define DT_RX 7 /* regular expressions */ #define DT_MAGIC 8 /* mailbox type */ -#define DT_SYN 9 /* synonym for another variable */ -#define DT_ADDR 10 /* e-mail address */ #define DTYPE(x) ((x) & DT_MASK) @@ -72,10 +69,6 @@ struct option_t { #endif /* _MAKEDOC */ -#ifndef ISPELL -#define ISPELL "ispell" -#endif - /* build complete documentation */ #ifdef _MAKEDOC @@ -182,23 +175,6 @@ struct option_t MuttVars[] = { ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before ** editing the body of an outgoing message. */ - {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, "us-ascii"}, - /* - ** .pp - ** This variable is a colon-separated list of character encoding - ** schemes for messages without character encoding indication. - ** Header field values and message body content without character encoding - ** indication would be assumed that they are written in one of this list. - ** By default, all the header fields and message body without any charset - ** indication are assumed to be in \fTus-ascii\fP. - ** .pp - ** For example, Japanese users might prefer this: - ** .pp - ** \fTset assumed_charset="iso-2022-jp:euc-jp:shift_jis:utf-8"\fP - ** .pp - ** However, only the first content is valid for the message body. - ** This variable is valid only if $$strict_mime is unset. - */ #ifdef USE_NNTP {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, /* @@ -331,11 +307,6 @@ struct option_t MuttVars[] = { ** as read when you leaving it. */ #endif - {"charset", DT_STR, R_NONE, UL &Charset, "" }, - /* - ** .pp - ** Character set your terminal uses to display and enter textual data. - */ {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" }, /* ** .pp @@ -415,16 +386,6 @@ struct option_t MuttVars[] = { ** will be saved for later references. Also see ``$$record'', ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''. */ - {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" }, - /* - ** .pp - ** This variable controls the use the GPGME enabled crypto backends. - ** If it is \fIset\fP and Madmutt was build with gpgme support, the gpgme code for - ** S/MIME and PGP will be used instead of the classic code. - ** .pp - ** \fBNote\fP: You need to use this option in your \fT.madmuttrc\fP configuration - ** file as it won't have any effect when used interactively. - */ {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" }, /* ** .pp @@ -558,25 +519,6 @@ struct option_t MuttVars[] = { ** you must take care of space-stuffing '\fP - ** when replying to the Madmutt developer's mailing list and Madmutt takes this email address. - ** .pp - ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP. - */ #ifdef USE_NNTP {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, /* @@ -846,15 +760,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 @@ -1121,11 +1026,6 @@ struct option_t MuttVars[] = { ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP */ #endif - {"ispell", DT_PATH, R_NONE, UL &Ispell, ISPELL}, - /* - ** .pp - ** How to invoke ispell (GNU's spell-checking software). - */ {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" }, /* ** .pp @@ -1161,30 +1061,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, "" }, /* @@ -1277,15 +1153,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 @@ -1447,19 +1314,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 @@ -1927,15 +1781,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 @@ -2254,7 +2099,6 @@ struct option_t MuttVars[] = { ** (S/MIME only) */ #if defined(USE_LIBESMTP) - {"smtp_auth_username", DT_SYN, R_NONE, UL "smtp_user", 0}, {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" }, /* ** .pp @@ -2264,7 +2108,6 @@ struct option_t MuttVars[] = { ** Defines the username to use with SMTP AUTH. Setting this variable will ** cause Madmutt to attempt to use SMTP AUTH when sending. */ - {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0}, {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" }, /* ** .pp @@ -2279,7 +2122,6 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 }, {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" }, /* ** .pp @@ -2483,7 +2325,6 @@ struct option_t MuttVars[] = { ** methods are unavailable. If a method is available but authentication ** fails, Madmutt will not connect to the POP server. */ - {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0}, {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" }, /* ** .pp @@ -2707,17 +2548,6 @@ struct option_t MuttVars[] = { ** Setting this variable to \fIyes\fP is not generally useful, and thus not ** recommended. */ - {"record", DT_PATH, R_NONE, UL &Outbox, ""}, - /* - ** .pp - ** This specifies the file into which your outgoing messages should be - ** appended. (This is meant as the primary method for saving a copy of - ** your messages, but another way to do this is using the ``$my_hdr'' - ** command to create a \fTBcc:\fP header field with your email address in it.) - ** .pp - ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and - ** ``$$save_name'' variables, and the ``$fcc-hook'' command. - */ {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, /* ** .pp @@ -2849,34 +2679,6 @@ struct option_t MuttVars[] = { ** Madmutt scores are always greater than or equal to zero, the default setting ** of this variable will never mark a message read. */ - {"send_charset", DT_STR, R_NONE, UL &SendCharset, "us-ascii:iso-8859-1:utf-8"}, - /* - ** .pp - ** A list of character sets for outgoing messages. Madmutt will use the - ** first character set into which the text can be converted exactly. - ** If your ``$$charset'' is not \fTiso-8859-1\fP and recipients may not - ** understand \fTUTF-8\fP, it is advisable to include in the list an - ** appropriate widely used standard character set (such as - ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either - ** instead of or after \fTiso-8859-1\fP. - */ - {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" }, - /* - ** .pp - ** Specifies the number of seconds to wait for the ``$$sendmail'' process - ** to finish before giving up and putting delivery in the background. - ** .pp - ** Madmutt interprets the value of this variable as follows: - ** .dl - ** .dt >0 .dd number of seconds to wait for sendmail to finish before continuing - ** .dt 0 .dd wait forever for sendmail to finish - ** .dt <0 .dd always put sendmail in the background without waiting - ** .de - ** .pp - ** Note that if you specify a value other than 0, the output of the child - ** process will be put in a temporary file. If there is some error, you - ** will be informed as to where to find the output. - */ #ifdef USE_NNTP {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, /* @@ -2922,22 +2724,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 - ** Specifies the filename of your signature, which is appended to all - ** outgoing messages. If the filename ends with a pipe (``\fT|\fP''), it is - ** assumed that filename is a shell command and input should be read from - ** its stdout. - */ {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" }, /* ** .pp @@ -3066,15 +2852,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 @@ -3310,18 +3087,6 @@ struct option_t MuttVars[] = { ** This sets the umask that will be used by Madmutt when creating all ** kinds of files. If \fIunset\fP, the default value is \fT077\fP. */ - {"use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, "no" }, - /* - ** .pp - ** \fBWarning:\fP do not set this variable unless you are using a version - ** of sendmail which supports the \fT-B8BITMIME\fP flag (such as sendmail - ** 8.8.x) or in connection with the SMTP support via libESMTP. - ** Otherwise you may not be able to send mail. - ** .pp - ** When \fIset\fP, Madmutt will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP - ** flag when sending 8-bit messages to enable ESMTP negotiation or tell - ** libESMTP to do so. - */ {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" }, /* ** .pp @@ -3352,7 +3117,6 @@ struct option_t MuttVars[] = { ** Normally, the default should work. */ #endif /* HAVE_GETADDRINFO */ - {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 }, {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" }, /* ** .pp @@ -3521,26 +3285,14 @@ 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 *); -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 *); 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; @@ -3549,22 +3301,16 @@ 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}, {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, - {"charset-hook", mutt_parse_hook, M_CHARSETHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, -#ifdef HAVE_ICONV - {"iconv-hook", mutt_parse_hook, M_ICONVHOOK}, -#endif {"mbox-hook", mutt_parse_hook, M_MBOXHOOK}, {"message-hook", mutt_parse_hook, M_MESSAGEHOOK}, {"open-hook", mutt_parse_hook, M_OPENHOOK}, @@ -3582,33 +3328,15 @@ 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} };