X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=64e7db17e6d9991c9312d57af289852e82f399c1;hp=e6ae39c1526ae3e882181bf7d405554cf00c3ce8;hb=5dcac54e5db074dc4572f843666c7f7acaf2d109;hpb=552847916ae6671d52db12880ee337f880cc766b diff --git a/init.h b/init.h index e6ae39c..64e7db1 100644 --- a/init.h +++ b/init.h @@ -11,13 +11,7 @@ * please see the file GPL in the top level source directory. */ -#ifdef _MAKEDOC -# include "config.h" -#else -# include "sort.h" -#endif - -#include "buffy.h" +#include "sort.h" #include "mutt.h" #ifndef _MAKEDOC @@ -30,8 +24,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,36 +64,8 @@ struct option_t { #endif /* _MAKEDOC */ -#ifndef ISPELL -#define ISPELL "ispell" -#endif - /* build complete documentation */ -#ifdef _MAKEDOC -# ifndef USE_SSL -# define USE_SSL -# endif -# ifndef USE_LIBESMTP -# define USE_LIBESMTP -# endif -# ifndef USE_NNTP -# define USE_NNTP -# endif -# ifndef USE_GNUTLS -# define USE_GNUTLS -# endif -# ifndef USE_HCACHE -# define USE_HCACHE -# endif -# ifndef HAVE_LIBIDN -# define HAVE_LIBIDN -# endif -# ifndef HAVE_GETADDRINFO -# define HAVE_GETADDRINFO -# endif -#endif - struct option_t MuttVars[] = { /*++*/ {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" }, @@ -155,21 +119,6 @@ struct option_t MuttVars[] = { ** message could include a line like ``\fT[-- PGP output follows ...\fP" and ** give it the same color as your attachment color. */ - {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, "no" }, - /* - ** .pp - ** When \fIset\fP, an arrow (``\fT->\fP'') will be used to indicate the current entry - ** in menus instead of highlighting the whole line. On slow network or modem - ** links this will make response faster because there is less that has to - ** be redrawn on the screen when moving to the next or previous entries - ** in the menu. - */ - {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will use plain ASCII characters when displaying thread - ** and attachment trees, instead of the default \fTACS\fP characters. - */ {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, "no" }, /* ** .pp @@ -182,43 +131,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" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header - ** field before editing the body of an outgoing news article. - */ - {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, Madmutt will prompt you for the \fTX-Comment-To:\fP header - ** field before editing the body of an outgoing news article. - */ -#endif {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "}, /* ** .pp @@ -320,22 +232,6 @@ struct option_t MuttVars[] = { ** follow these menus. The option is disabled by default because many ** visual terminals don't permit making the cursor invisible. */ -#ifdef USE_NNTP - {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup - ** 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 @@ -413,33 +309,7 @@ struct option_t MuttVars[] = { ** .pp ** This variable controls whether or not copies of your outgoing messages ** 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 - ** This variable controls whether or not Madmutt may automatically enable - ** PGP encryption/signing for messages. See also ``$$crypt_autoencrypt'', - ** ``$$crypt_replyencrypt'', - ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''. - */ - {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, "yes" }, - /* - ** .pp - ** This variable controls whether or not Madmutt may automatically enable - ** S/MIME encryption/signing for messages. See also ``$$crypt_autoencrypt'', - ** ``$$crypt_replyencrypt'', - ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''. + ** and ``$fcc-hook''. */ {"date_format", DT_STR, R_BOTH, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"}, /* @@ -558,25 +428,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"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable allows you to customize the newsgroup browser display to - ** your personal taste. This string is similar to ``$index_format'', but - ** has its own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .ts - ** %C current newsgroup number - ** %d description of newsgroup (retrieved from server) - ** %f newsgroup name - ** %M ``-'' if newsgroup not allowed for direct post (moderated for example) - ** %N ``N'' if newsgroup is new, ``u'' if unsubscribed, blank otherwise - ** %n number of new articles in newsgroup - ** %s number of unread articles in newsgroup - ** %>X right justify the rest of the string and pad with character "X" - ** %|X pad to the end of the line with character "X" - ** .te - */ -#endif - {"hdrs", DT_BOOL, R_NONE, OPTHDRS, "yes" }, - /* - ** .pp - ** When \fIunset\fP, the header fields normally added by the ``$my_hdr'' - ** command are not created. This variable \fImust\fP be \fIunset\fP before - ** composing a new message or replying in order to take effect. If \fIset\fP, - ** the user defined header fields are added to every new message. - */ {"header", DT_BOOL, R_NONE, OPTHEADER, "no" }, /* ** .pp @@ -780,18 +549,6 @@ struct option_t MuttVars[] = { ** of the message you are replying to into the edit buffer. ** The ``$$weed'' setting applies. */ - {"help", DT_BOOL, R_BOTH, OPTHELP, "yes" }, - /* - ** .pp - ** When \fIset\fP, help lines describing the bindings for the major functions - ** provided by each menu are displayed on the first line of the screen. - ** .pp - ** \fBNote:\fP The binding will not be displayed correctly if the - ** function is bound to a sequence rather than a single keystroke. Also, - ** the help line may not be updated if a binding is changed while Madmutt is - ** running. Since this variable is primarily aimed at new users, neither - ** of these should present a major problem. - */ {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, "no" }, /* ** .pp @@ -846,15 +603,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 @@ -913,13 +661,6 @@ struct option_t MuttVars[] = { ** .pp ** \fBNote:\fP This is a space separated list. */ - {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" }, - /* - ** .pp - ** You normally want to see your personal folders alongside - ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set - ** this variable to the IMAP path to your folders. - */ {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" }, /* ** .pp @@ -975,14 +716,6 @@ struct option_t MuttVars[] = { ** user/password pairs on Madmutt invocation, or if opening the connection ** is slow. */ - {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will avoid implicitly marking your mail as read whenever - ** you fetch a message from the server. This is generally a good thing, - ** but can make closing an IMAP folder somewhat slower. This option - ** exists to appease speed freaks. - */ {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" }, /* ** .pp @@ -1021,12 +754,6 @@ struct option_t MuttVars[] = { ** Controls whether or not a copy of the message(s) you are replying to ** is included in your reply. */ - {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, "no" }, - /* - ** .pp - ** Controls whether or not Madmutt includes only the first attachment - ** of the message you are replying. - */ {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "}, /* ** .pp @@ -1103,29 +830,6 @@ struct option_t MuttVars[] = { ** .pp ** See also: ``$$to_chars''. */ -#ifdef USE_NNTP - {"nntp_inews", DT_PATH, R_NONE, UL &Inews, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, specifies the program and arguments used to deliver news posted - ** by Madmutt. Otherwise, Madmutt posts article using current connection. - ** The following \fTprintf(3)\fP-style sequence is understood: - ** .pp - ** .ts - ** %s newsserver name - ** .te - ** .pp - ** 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,55 +865,8 @@ 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, "" }, - /* - ** .pp - ** Availability: Header Cache - ** - ** .pp - ** The $$header_cache variable points to the header cache database. - ** .pp - ** If $$header_cache points to a directory it will contain a header cache - ** database per folder. If $$header_cache points to a file that file will - ** be a single global header cache. By default it is \fIunset\fP so no - ** header caching will be used. - */ - {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, "yes" }, - /* - ** .pp - ** Availability: Header Cache - ** - ** .pp - ** Check for Maildir unaware programs other than Madmutt having modified maildir - ** files when the header cache is in use. This incurs one \fTstat(2)\fP per - ** message every time the folder is opened. - */ -#if defined(HAVE_GDBM) || defined(HAVE_DB4) +#if defined(HAVE_GDBM) {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, "16384"}, /* ** .pp @@ -1224,7 +881,7 @@ struct option_t MuttVars[] = { ** less the best you can get. For details google for mutt header ** cache (first hit). */ -#endif /* HAVE_GDBM || HAVE_DB 4 */ +#endif /* HAVE_GDBM */ #ifdef HAVE_QDBM { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" }, /* @@ -1277,15 +934,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 @@ -1293,12 +941,6 @@ struct option_t MuttVars[] = { ** variable specifies the characters at which to split a folder name into ** ``hierarchy items.'' */ - {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"}, - /* - ** .pp - ** This specifies the delimiter between the sidebar (if visible) and - ** other screens. - */ {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, "no" }, /* ** .pp @@ -1356,7 +998,7 @@ struct option_t MuttVars[] = { /* ** .pp ** The default mailbox type used when creating new folders. May be any of - ** \fTmbox\fP, \fTMMDF\fP, \fTMH\fP and \fTMaildir\fP. + ** \fTmbox\fP, \fTMH\fP and \fTMaildir\fP. */ {"metoo", DT_BOOL, R_NONE, OPTMETOO, "no" }, /* @@ -1385,17 +1027,6 @@ struct option_t MuttVars[] = { ** is cleared and the next or previous page of the menu is displayed ** (useful for slow links to avoid many redraws). */ - {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, "no" }, - /* - ** .pp - ** If \fIset\fP, forces Madmutt to interpret keystrokes with the high bit (bit 8) - ** set as if the user had pressed the \fTESC\fP key and whatever key remains - ** after having the high bit removed. For example, if the key pressed - ** has an ASCII value of \fT0xf8\fP, then this is treated as if the user had - ** pressed \fTESC\fP then ``\fTx\fP''. This is because the result of removing the - ** high bit from ``\fT0xf8\fP'' is ``\fT0x78\fP'', which is the ASCII character - ** ``\fTx\fP''. - */ {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" }, /* ** .pp @@ -1447,41 +1078,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 - ** This variable describes the format of a remailer line on the mixmaster - ** chain selection screen. The following \fTprintf(3)\fP-like sequences are - ** supported: - ** .pp - ** .dl - ** .dt %n .dd The running number on the menu. - ** .dt %c .dd Remailer capabilities. - ** .dt %s .dd The remailer's short name. - ** .dt %a .dd The remailer's e-mail address. - ** .de - */ - {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, 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. - */ {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" }, /* ** .pp @@ -1532,159 +1128,32 @@ struct option_t MuttVars[] = { ** This variable, when \fIset\fP, makes the thread tree narrower, allowing ** deeper threads to fit on the screen. */ -#ifdef USE_NNTP - {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.madmutt"}, + { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" }, + /* + ** .pp + ** Operations that expect to transfer a large amount of data over the + ** network will update their progress every \fInet_inc\fP kilobytes. + ** If set to 0, no progress messages will be displayed. + ** .pp + ** See also ``$$read_inc'' and ``$$write_inc''. + */ + {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" }, /* ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable points to directory where Madmutt will cache news - ** article headers. If \fIunset\fP, headers will not be saved at all - ** and will be reloaded each time when you enter a newsgroup. - ** .pp - ** As for the header caching in connection with IMAP and/or Maildir, - ** this drastically increases speed and lowers traffic. + ** This variable controls the number of lines of context that are given + ** when displaying the next or previous page in the internal pager. By + ** default, Madmutt will display the line after the last one on the screen + ** at the top of the next page (0 lines of context). */ - {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" }, + {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, "-%Z- %C/%m: %-20.20n %s"}, /* ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable specifies the name (or address) of the NNTP server to be used. - ** .pp - ** It - ** defaults to the value specified via the environment variable - ** \fT$$$NNTPSERVER\fP or contained in the file \fT/etc/nntpserver\fP. - ** .pp - ** You can also - ** specify a username and an alternative port for each newsserver, e.g. - ** .pp - ** \fT[nntp[s]://][username[:password]@]newsserver[:port]\fP - ** .pp - ** \fBNote:\fP Using a password as shown and stored in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. + ** This variable controls the format of the one-line message ``status'' + ** displayed before each message in either the internal or an external + ** pager. The valid sequences are listed in the ``$$index_format'' + ** section. */ - {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, "~/.newsrc"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This file contains information about subscribed newsgroup and - ** articles read so far. - ** .pp - ** To ease the use of multiple news servers, the following \fTprintf(3)\fP-style - ** sequence is understood: - ** .pp - ** .ts - ** %s newsserver name - ** .te - */ - {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls how many news articles to cache per newsgroup - ** (if caching is enabled, see $$nntp_cache_dir) and how many news articles - ** to show in the ``index'' menu. - ** .pp - ** If there're more articles than defined with $$nntp_context, all older ones - ** will be removed/not shown in the index. - */ - {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls whether or not descriptions for newsgroups - ** are to be loaded when subscribing to a newsgroup. - */ - {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your login name on the NNTP server. If \fIunset\fP and the server requires - ** authentification, Madmutt will prompt you for your account name. - */ - {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your password for NNTP account. - ** .pp - ** \fBNote:\fP Storing passwords in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** The time in seconds until any operations on a newsgroup except posting a new - ** article will cause a recheck for new news. If set to 0, Madmutt will - ** recheck on each operation in index (stepping, read article, etc.). - */ - {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Controls whether or not Madmutt will try to reconnect to a newsserver when the - ** was connection lost. - */ -#endif - { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" }, - /* - ** .pp - ** Operations that expect to transfer a large amount of data over the - ** network will update their progress every \fInet_inc\fP kilobytes. - ** If set to 0, no progress messages will be displayed. - ** .pp - ** See also ``$$read_inc'' and ``$$write_inc''. - */ - {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"}, - /* - ** .pp - ** This variable specifies which pager you would like to use to view - ** messages. ``builtin'' means to use the builtin pager, otherwise this - ** variable should specify the pathname of the external pager you would - ** like to use. - ** .pp - ** Using an external pager may have some disadvantages: Additional - ** keystrokes are necessary because you can't call Madmutt functions - ** directly from the pager, and screen resizes cause lines longer than - ** the screen width to be badly formatted in the help menu. - */ - {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" }, - /* - ** .pp - ** This variable controls the number of lines of context that are given - ** when displaying the next or previous page in the internal pager. By - ** default, Madmutt will display the line after the last one on the screen - ** at the top of the next page (0 lines of context). - */ - {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, "-%Z- %C/%m: %-20.20n %s"}, - /* - ** .pp - ** This variable controls the format of the one-line message ``status'' - ** displayed before each message in either the internal or an external - ** pager. The valid sequences are listed in the ``$$index_format'' - ** section. - */ - {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, "0" }, + {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, "0" }, /* ** .pp ** Determines the number of lines of a mini-index which is shown when in @@ -1706,160 +1175,6 @@ struct option_t MuttVars[] = { ** when you are at the end of a message and invoke the \fInext-page\fP ** function. */ - {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, "no" }, - /* - ** .pp - ** Setting this variable will cause Madmutt to always attempt to - ** cryptographically sign outgoing messages. This can be overridden - ** by use of the \fIpgp-menu\fP, when signing is not required or - ** encryption is requested as well. If ``$$smime_is_default'' is \fIset\fP, - ** then OpenSSL is used instead to create S/MIME messages and settings can - ** be overridden by use of the \fIsmime-menu\fP. - ** (Crypto only) - */ - {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, "no" }, - /* - ** .pp - ** Setting this variable will cause Madmutt to always attempt to PGP - ** encrypt outgoing messages. This is probably only useful in - ** connection to the \fIsend-hook\fP command. It can be overridden - ** by use of the \fIpgp-menu\fP, when encryption is not required or - ** signing is requested as well. If ``$$smime_is_default'' is \fIset\fP, - ** then OpenSSL is used instead to create S/MIME messages and - ** settings can be overridden by use of the \fIsmime-menu\fP. - ** (Crypto only) - */ - {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" }, - /* - ** .pp - ** Setting this variable will cause Madmutt to ignore OpenPGP subkeys. Instead, - ** the principal key will inherit the subkeys' capabilities. \fIUnset\fP this - ** if you want to play interesting key selection games. - ** (PGP only) - */ - {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" }, - /* - ** .pp - ** If \fIset\fP, automatically PGP or OpenSSL encrypt replies to messages which are - ** encrypted. - ** (Crypto only) - */ - {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, "no" }, - /* - ** .pp - ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages which are - ** signed. - ** .pp - ** \fBNote:\fP this does not work on messages that are encrypted \fBand\fP signed! - ** (Crypto only) - */ - {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, "no" }, - /* - ** .pp - ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages - ** which are encrypted. This makes sense in combination with - ** ``$$crypt_replyencrypt'', because it allows you to sign all - ** messages which are automatically encrypted. This works around - ** the problem noted in ``$$crypt_replysign'', that Madmutt is not able - ** to find out whether an encrypted message is also signed. - ** (Crypto only) - */ - {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding - ** PGP or S/MIME output, so spoofing such lines is more difficult. - ** If you are using colors to mark these lines, and rely on these, - ** you may \fIunset\fP this setting. - ** (Crypto only) - */ - {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will use a possibly-running gpg-agent process. - ** (PGP only) - */ - {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" }, - /* - ** .pp - ** If ``\fIyes\fP'', always attempt to verify PGP or S/MIME signatures. - ** If ``\fIask\fP'', ask whether or not to verify the signature. - ** If ``\fIno\fP'', never attempt to verify cryptographic signatures. - ** (Crypto only) - */ - {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" }, - /* - ** .pp - ** The default behaviour of Madmutt is to use PGP on all auto-sign/encryption - ** operations. To override and to use OpenSSL instead this must be \fIset\fP. - ** .pp - ** However, this has no effect while replying, since Madmutt will automatically - ** select the same application that was used to sign/encrypt the original - ** message. - ** .pp - ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.) - ** (S/MIME only) - */ - {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, "yes" }, - /* - ** .pp - ** This flag controls whether you want to be asked to enter a label - ** for a certificate about to be added to the database or not. It is - ** \fIset\fP by default. - ** (S/MIME only) - */ - {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" }, - /* - ** .pp - ** If \fIset\fP (default) this tells Madmutt to use the default key for decryption. Otherwise, - ** if manage multiple certificate-key-pairs, Madmutt will try to use the mailbox-address - ** to determine the key to use. It will ask you to supply a key, if it can't find one. - ** (S/MIME only) - */ - {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"}, - /* - ** .pp - ** This variable allows you to customize the PGP key selection menu to - ** your personal taste. This string is similar to ``$$index_format'', but - ** has its own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .dl - ** .dt %n .dd number - ** .dt %k .dd key id - ** .dt %u .dd user id - ** .dt %a .dd algorithm - ** .dt %l .dd key length - ** .dt %f .dd flags - ** .dt %c .dd capabilities - ** .dt %t .dd trust/validity of the key-uid association - ** .dt %[] .dd date of the key where is an \fTstrftime(3)\fP expression - ** .de - ** .pp - ** (PGP only) - */ - {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, "" }, - /* - ** .pp - ** If you assign a text to this variable, then a PGP signature is only - ** considered verified if the output from $$pgp_verify_command contains - ** the text. Use this variable if the exit code from the command is 0 - ** even for bad signatures. - ** (PGP only) - */ - {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will check the exit code of the PGP subprocess when - ** signing or encrypting. A non-zero exit code means that the - ** subprocess failed. - ** (PGP only) - */ - {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, "no" }, - /* - ** .pp - ** If \fIset\fP, use 64 bit PGP key IDs. \fIUnset\fP uses the normal 32 bit Key IDs. - ** (PGP only) - */ {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" }, /* ** .pp @@ -1871,46 +1186,6 @@ struct option_t MuttVars[] = { ** removed, while the inner multipart/signed part is retained. ** (PGP only) */ - {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" }, - /* - ** .pp - ** This option controls whether Madmutt generates old-style inline - ** (traditional) PGP encrypted or signed messages under certain - ** circumstances. This can be overridden by use of the \fIpgp-menu\fP, - ** when inline is not required. - ** .pp - ** Note that Madmutt might automatically use PGP/MIME for messages - ** which consist of more than a single MIME part. Madmutt can be - ** configured to ask before sending PGP/MIME messages when inline - ** (traditional) would not work. - ** See also: ``$$pgp_mime_auto''. - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" }, - /* - ** .pp - ** Setting this variable will cause Madmutt to always attempt to - ** create an inline (traditional) message when replying to a - ** message which is PGP encrypted/signed inline. This can be - ** overridden by use of the \fIpgp-menu\fP, when inline is not - ** required. This option does not automatically detect if the - ** (replied-to) message is inline; instead it relies on Madmutt - ** internals for previously checked/flagged messages. - ** .pp - ** Note that Madmutt might automatically use PGP/MIME for messages - ** which consist of more than a single MIME part. Madmutt can be - ** configured to ask before sending PGP/MIME messages when inline - ** (traditional) would not work. - ** See also: ``$$pgp_mime_auto''. - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - ** - */ {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" }, /* ** .pp @@ -1927,22 +1202,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 - ** The number of seconds after which a cached passphrase will expire if - ** not used. Default: 300. - ** (PGP only) - */ {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" }, /* ** .pp @@ -1960,141 +1219,6 @@ struct option_t MuttVars[] = { ** ``reverse-''. ** (PGP only) */ - {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" }, - /* - ** .pp - ** This option controls whether Madmutt will prompt you for - ** automatically sending a (signed/encrypted) message using - ** PGP/MIME when inline (traditional) fails (for any reason). - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will automatically attempt to decrypt traditional PGP - ** messages whenever the user performs an operation which ordinarily would - ** result in the contents of the message being operated on. For example, - ** if the user displays a pgp-traditional message which has not been manually - ** checked with the check-traditional-pgp function, Madmutt will automatically - ** check the message for traditional pgp. - */ - /* XXX Default values! */ - {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" }, - /* - ** .pp - ** This format strings specifies a command which is used to decode - ** application/pgp attachments. - ** .pp - ** The PGP command formats have their own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .dl - ** .dt %p .dd Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty - ** string otherwise. Note: This may be used with a %? construct. - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %a .dd The value of $$pgp_sign_as. - ** .dt %r .dd One or more key IDs. - ** .de - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (PGP only) - */ - {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" }, - /* - ** .pp - ** This command is invoked whenever Madmutt will need public key information. - ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format. - ** (PGP only) - */ - {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify PGP signatures. - ** (PGP only) - */ - {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, "" }, - /* - ** .pp - ** This command is used to decrypt a PGP encrypted message. - ** (PGP only) - */ - {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, "" }, - /* - ** .pp - ** This format is used to create a old-style ``clearsigned'' PGP message. - ** .pp - ** Note that the use of this format is \fBstrongly\fP \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" }, - /* - ** .pp - ** This command is used to create the detached PGP signature for a - ** multipart/signed PGP/MIME body part. - ** (PGP only) - */ - {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, "" }, - /* - ** .pp - ** This command is used to both sign and encrypt a body part. - ** (PGP only) - */ - {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, "" }, - /* - ** .pp - ** This command is used to encrypt a body part without signing it. - ** (PGP only) - */ - {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" }, - /* - ** .pp - ** This command is used to import a key from a message into - ** the user's public key ring. - ** (PGP only) - */ - {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, "" }, - /* - ** .pp - ** This command is used to export a public key from the user's - ** key ring. - ** (PGP only) - */ - {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, "" }, - /* - ** .pp - ** This command is used to verify key information from the key selection - ** menu. - ** (PGP only) - */ - {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, "" }, - /* - ** .pp - ** This command is used to list the secret key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ - {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" }, - /* - ** .pp - ** This command is used to list the public key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, /* ** .pp @@ -2104,13 +1228,6 @@ struct option_t MuttVars[] = { ** ``$$mime_forward_decode'' is \fIunset\fP. ** (PGP only) */ - {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. - ** (S/MIME only) - */ {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" }, /* ** .pp @@ -2121,131 +1238,6 @@ struct option_t MuttVars[] = { ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used. ** (S/MIME only) */ - {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" }, - /* - ** .pp - ** Since there is no pubring/secring as with PGP, Madmutt has to handle - ** storage ad retrieval of keys/certs by itself. This is very basic right now, - ** and stores keys and certificates in two different directories, both - ** named as the hash-value retrieved from OpenSSL. There is an index file - ** which contains mailbox-address keyid pair, and which can be manually - ** edited. This one points to the location of the private keys. - ** (S/MIME only) - */ - {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, "" }, - /* - ** .pp - ** This variable contains the name of either a directory, or a file which - ** contains trusted certificates for use with OpenSSL. - ** (S/MIME only) - */ - {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" }, - /* - ** .pp - ** Since there is no pubring/secring as with PGP, Madmutt has to handle - ** storage and retrieval of keys by itself. This is very basic right - ** now, and keys and certificates are stored in two different - ** directories, both named as the hash-value retrieved from - ** OpenSSL. There is an index file which contains mailbox-address - ** keyid pairs, and which can be manually edited. This one points to - ** the location of the certificates. - ** (S/MIME only) - */ - {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, "" }, - /* - ** .pp - ** This format string specifies a command which is used to decrypt - ** \fTapplication/x-pkcs7-mime\fP attachments. - ** .pp - ** The OpenSSL command formats have their own set of \fTprintf(3)\fP-like sequences - ** similar to PGP's: - ** .pp - ** .dl - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %k .dd The key-pair specified with $$smime_default_key - ** .dt %c .dd One or more certificate IDs. - ** .dt %a .dd The algorithm used for encryption. - ** .dt %C .dd CA location: Depending on whether $$smime_ca_location - ** . points to a directory or file, this expands to - ** . "-CApath $$smime_ca_location" or "-CAfile $$smime_ca_location". - ** .de - ** .pp - ** For examples on how to configure these formats, see the smime.rc in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (S/MIME only) - */ - {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type \fTmultipart/signed\fP. - ** (S/MIME only) - */ - {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type - ** \fTapplication/x-pkcs7-mime\fP. - ** (S/MIME only) - */ - {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTmultipart/signed\fP, which can be read by all mail clients. - ** (S/MIME only) - */ - {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTapplication/x-pkcs7-signature\fP, which can only be handled by mail - ** clients supporting the S/MIME extension. - ** (S/MIME only) - */ - {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, "" }, - /* - ** .pp - ** This command is used to create encrypted S/MIME messages. - ** (S/MIME only) - */ - {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, "" }, - /* - ** .pp - ** This command is used to extract PKCS7 structures of S/MIME signatures, - ** in order to extract the public X509 certificate(s). - ** (S/MIME only) - */ - {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, "" }, - /* - ** .pp - ** This command is used to extract X509 certificates from a PKCS7 structure. - ** (S/MIME only) - */ - {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, "" }, - /* - ** .pp - ** This command is used to extract only the signers X509 certificate from a S/MIME - ** signature, so that the certificate's owner may get compared to the - ** email's ``\fTFrom:\fP'' header field. - ** (S/MIME only) - */ - {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, "" }, - /* - ** .pp - ** This command is used to import a certificate via \fTsmime_keysng\fP. - ** (S/MIME only) - */ - {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, "" }, - /* - ** .pp - ** This command is used to extract the mail address(es) used for storing - ** X509 certificates, and for verification purposes (to check whether the - ** certificate was issued for the sender's mailbox). - ** (S/MIME only) - */ {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" }, /* ** .pp @@ -2253,189 +1245,6 @@ struct option_t MuttVars[] = { ** keyid (the hash-value that OpenSSL generates) to work properly ** (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 - ** Availability: SMTP - ** - ** .pp - ** 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 - ** Availability: SMTP - ** - ** .pp - ** Defines the password to use with SMTP AUTH. If ``$$smtp_user'' - ** is set, but this variable is not, you will be prompted for a password - ** when sending. - ** .pp - ** \fBNote:\fP Storing passwords in a configuration file - ** 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 - ** Availability: SMTP - ** - ** .pp - ** Defines the SMTP host which will be used to deliver mail, as opposed - ** to invoking the sendmail binary. Setting this variable overrides the - ** value of ``$$sendmail'', and any associated variables. - */ - {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, "25" }, - /* - ** .pp - ** Availability: SMTP - ** - ** .pp - ** Defines the port that the SMTP host is listening on for mail delivery. - ** Must be specified as a number. - ** .pp - ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP - ** servers will probably desire 587, the mail submission port. - */ - {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, "" }, - /* - ** .pp - ** Availability: SMTP (and SSL) - ** - ** .pp - ** Defines wether to use STARTTLS. If this option is set to ``\fIrequired\fP'' - ** and the server does not support STARTTLS or there is an error in the - ** TLS Handshake, the connection will fail. Setting this to ``\fIenabled\fP'' - ** will try to start TLS and continue without TLS in case of an error. - ** - **.pp - ** Madmutt still needs to have SSL support enabled in order to use it. - */ -#endif -#if defined(USE_SSL) || defined(USE_GNUTLS) -#ifdef USE_SSL - {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, "" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** The file containing a client certificate and its associated private - ** key. - */ -#endif /* USE_SSL */ - {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" }, - /* - ** .pp - ** If this variable is \fIset\fP, Madmutt will require that all connections - ** to remote servers be encrypted. Furthermore it will attempt to - ** negotiate TLS even if the server does not advertise the capability, - ** since it would otherwise have to abort the connection anyway. This - ** option supersedes ``$$ssl_starttls''. - */ - {"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, "yes" }, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** If \fIset\fP (the default), Madmutt will attempt to use STARTTLS on servers - ** advertising the capability. When \fIunset\fP, Madmutt will not attempt to - ** use STARTTLS regardless of the server's capabilities. - */ - {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.mutt_certificates"}, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** This variable specifies the file where the certificates you trust - ** are saved. When an unknown certificate is encountered, you are asked - ** if you accept it or not. If you accept it, the certificate can also - ** be saved in this file and further connections are automatically - ** accepted. - ** .pp - ** You can also manually add CA certificates in this file. Any server - ** certificate that is signed with one of these CA certificates are - ** also automatically accepted. - ** .pp - ** Example: \fTset certificate_file=~/.madmutt/certificates\fP - */ -# if defined(_MAKEDOC) || !defined (USE_GNUTLS) - {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, "yes" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** If set to \fIyes\fP, Madmutt will use CA certificates in the - ** system-wide certificate store when checking if server certificate - ** is signed by a trusted CA. - */ - {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, "" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** The file which includes random data that is used to initialize SSL - ** library functions. - */ - {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** This variables specifies whether to attempt to use SSLv2 in the - ** SSL authentication process. - */ -# endif /* _MAKEDOC || !USE_GNUTLS */ - {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, "yes" }, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** This variables specifies whether to attempt to use SSLv3 in the - ** SSL authentication process. - */ - {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, "yes" }, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** This variables specifies whether to attempt to use TLSv1 in the - ** SSL authentication process. - */ -# ifdef USE_GNUTLS - {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, "0" }, - /* - ** .pp - ** Availability: GNUTLS - ** - ** .pp - ** This variable specifies the minimum acceptable prime size (in bits) - ** for use in any Diffie-Hellman key exchange. A value of 0 will use - ** the default from the GNUTLS library. - */ - {"ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, "" }, - /* - ** .pp - ** This variable specifies a file containing trusted CA certificates. - ** Any server certificate that is signed with one of these CA - ** certificates are also automatically accepted. - ** .pp - ** Example: \fTset ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt\fP - */ -# endif /* USE_GNUTLS */ -# endif /* USE_SSL || USE_GNUTLS */ {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" }, /* ** .pp @@ -2475,15 +1284,6 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP */ - {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will try all available methods. When \fIunset\fP, Madmutt will - ** only fall back to other authentication methods if the previous - ** 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 @@ -2532,34 +1332,13 @@ struct option_t MuttVars[] = { {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""}, /* ** .pp - ** Specifies the password for your POP account. If \fIunset\fP, Madmutt will - ** prompt you for your password when you open POP mailbox. - ** .pp - ** \fBNote:\fP Storing passwords in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""}, - /* - ** .pp - ** Similar to the ``$$attribution'' variable, Madmutt will append this - ** string after the inclusion of a message which is being replied to. - */ -#ifdef USE_NNTP - {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have - ** not permissions to post (e.g. moderated). + ** Specifies the password for your POP account. If \fIunset\fP, Madmutt will + ** prompt you for your password when you open POP mailbox. ** .pp - ** \fBNote:\fP if the newsserver - ** does not support posting to that newsgroup or a group is totally read-only, that - ** posting will not have any effect. + ** \fBNote:\fP Storing passwords in a configuration file + ** presents a security risk since the superuser of your machine may read it + ** regardless of the file's permissions. */ -#endif {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" }, /* ** .pp @@ -2707,17 +1486,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 @@ -2789,127 +1557,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. */ - {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will take the sender's full address when choosing a - ** default folder for saving a mail. If ``$$save_name'' or ``$$force_name'' - ** is \fIset\fP too, the selection of the fcc folder will be changed as well. - */ - {"save_empty", DT_BOOL, R_NONE, OPTSAVEEMPTY, "yes" }, - /* - ** .pp - ** When \fIunset\fP, mailboxes which contain no saved messages will be removed - ** when closed (the exception is ``$$spoolfile'' which is never removed). - ** If \fIset\fP, mailboxes are never removed. - ** .pp - ** \fBNote:\fP This only applies to mbox and MMDF folders, Madmutt does not - ** delete MH and Maildir directories. - */ - {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, "no" }, - /* - ** .pp - ** This variable controls how copies of outgoing messages are saved. - ** When set, a check is made to see if a mailbox specified by the - ** recipient address exists (this is done by searching for a mailbox in - ** the ``$$folder'' directory with the \fIusername\fP part of the - ** recipient address). If the mailbox exists, the outgoing message will - ** be saved to that mailbox, otherwise the message is saved to the - ** ``$$record'' mailbox. - ** .pp - ** Also see the ``$$force_name'' variable. - */ - {"score", DT_BOOL, R_NONE, OPTSCORE, "yes" }, - /* - ** .pp - ** When this variable is \fIunset\fP, scoring is turned off. This can - ** be useful to selectively disable scoring for certain folders when the - ** ``$$score_threshold_delete'' variable and friends are used. - ** - */ - {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, "-1" }, - /* - ** .pp - ** Messages which have been assigned a score equal to or lower than the value - ** of this variable are automatically marked for deletion by Madmutt. Since - ** Madmutt scores are always greater than or equal to zero, the default setting - ** of this variable will never mark a message for deletion. - */ - {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, "9999" }, - /* - ** .pp - ** Messages which have been assigned a score greater than or equal to this - ** variable's value are automatically marked ``flagged''. - */ - {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, "-1" }, - /* - ** .pp - ** Messages which have been assigned a score equal to or lower than the value - ** of this variable are automatically marked as read by Madmutt. Since - ** 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" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** When \fIset\fP, info about unsubscribed newsgroups will be saved into the - ** ``newsrc'' file and into the news cache. - */ -#endif -#ifdef USE_NNTP - {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, the newsserver will be asked for new newsgroups on entering - ** the browser. Otherwise, it will be done only once for a newsserver. - ** Also controls whether or not the number of new articles of subscribed - ** newsgroups will be checked. - */ - {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, only subscribed newsgroups that contain unread articles - ** will be displayed in the newsgroup browser. - */ -#endif {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, "yes" }, /* ** .pp @@ -2922,22 +1569,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 +1697,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 +1932,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 @@ -3343,7 +1953,6 @@ struct option_t MuttVars[] = { ** This variable only affects decoding. */ #endif /* HAVE_LIBIDN */ -#ifdef HAVE_GETADDRINFO {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, "yes" }, /* ** .pp @@ -3351,8 +1960,6 @@ struct option_t MuttVars[] = { ** contact. If this option is \fIunset\fP, Madmutt will restrict itself to IPv4 addresses. ** 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 @@ -3445,15 +2052,172 @@ struct option_t MuttVars[] = { ** to the one used by ``$$status_format''. */ #ifdef USE_NNTP - {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, "no" }, + {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have + ** not permissions to post (e.g. moderated). + ** .pp + ** \fBNote:\fP if the newsserver + ** does not support posting to that newsgroup or a group is totally read-only, that + ** posting will not have any effect. + */ + {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable specifies the name (or address) of the NNTP server to be used. + ** .pp + ** It + ** defaults to the value specified via the environment variable + ** \fT$$$NNTPSERVER\fP or contained in the file \fT/etc/nntpserver\fP. + ** .pp + ** You can also + ** specify a username and an alternative port for each newsserver, e.g. + ** .pp + ** \fT[nntp[s]://][username[:password]@]newsserver[:port]\fP + ** .pp + ** \fBNote:\fP Using a password as shown and stored in a configuration file + ** presents a security risk since the superuser of your machine may read it + ** regardless of the file's permissions. + */ + {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** If \fIset\fP, Madmutt will add a ``\fTX-Comment-To:\fP'' header field - ** (that contains full name of the original article author) to articles that - ** you followup to. + ** This variable controls how many news articles to cache per newsgroup + ** (if caching is enabled, see $$nntp_cache_dir) and how many news articles + ** to show in the ``index'' menu. + ** .pp + ** If there're more articles than defined with $$nntp_context, all older ones + ** will be removed/not shown in the index. + */ + {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable controls whether or not descriptions for newsgroups + ** are to be loaded when subscribing to a newsgroup. + */ + {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** Your login name on the NNTP server. If \fIunset\fP and the server requires + ** authentification, Madmutt will prompt you for your account name. + */ + {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** Your password for NNTP account. + ** .pp + ** \fBNote:\fP Storing passwords in a configuration file + ** presents a security risk since the superuser of your machine may read it + ** regardless of the file's permissions. + */ + {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** The time in seconds until any operations on a newsgroup except posting a new + ** article will cause a recheck for new news. If set to 0, Madmutt will + ** recheck on each operation in index (stepping, read article, etc.). + */ + {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** Controls whether or not Madmutt will try to reconnect to a newsserver when the + ** was connection lost. + */ + {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable allows you to customize the newsgroup browser display to + ** your personal taste. This string is similar to ``$index_format'', but + ** has its own set of \fTprintf(3)\fP-like sequences: + ** .pp + ** .ts + ** %C current newsgroup number + ** %d description of newsgroup (retrieved from server) + ** %f newsgroup name + ** %M ``-'' if newsgroup not allowed for direct post (moderated for example) + ** %N ``N'' if newsgroup is new, ``u'' if unsubscribed, blank otherwise + ** %n number of new articles in newsgroup + ** %s number of unread articles in newsgroup + ** %>X right justify the rest of the string and pad with character "X" + ** %|X pad to the end of the line with character "X" + ** .te + */ + {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If this variable is \fIset\fP and the keyword "\fTposter\fP" is present in + ** the \fTFollowup-To:\fP header field, a follow-up to the newsgroup is not + ** permitted. The message will be mailed to the submitter of the + ** message via mail. + */ + {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup + ** as read when you leaving it. + */ + {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header + ** field before editing the body of an outgoing news article. + */ + {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, the newsserver will be asked for new newsgroups on entering + ** the browser. Otherwise, it will be done only once for a newsserver. + ** Also controls whether or not the number of new articles of subscribed + ** newsgroups will be checked. + */ + {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, only subscribed newsgroups that contain unread articles + ** will be displayed in the newsgroup browser. */ #endif /*--*/ @@ -3521,26 +2285,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 +2301,15 @@ 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}, @@ -3576,39 +2321,19 @@ struct command_t Commands[] = { {"macro", mutt_parse_macro, 0}, {"mono", mutt_parse_mono, 0}, {"push", mutt_parse_push, 0}, - {"score", mutt_parse_score, 0}, {"uncolor", mutt_parse_uncolor, 0}, {"unhook", mutt_parse_unhook, 0}, {"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} };