X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=fdad6665fc22284c4f477cdd7aa55092733bf346;hp=77b12cb01000859dcafc548d108443b7731c1aec;hb=7dcd7ee09b8760133ac8ec00562e4d60b2f0aebd;hpb=0ab517261694b001d2eb17f06f167a4cdd2c7c07 diff --git a/init.h b/init.h index 77b12cb..fdad666 100644 --- a/init.h +++ b/init.h @@ -11,12 +11,7 @@ * please see the file GPL in the top level source directory. */ -#ifdef _MAKEDOC -# include "config.h" -#else -# include "sort.h" -#endif - +#include "sort.h" #include "mutt.h" #ifndef _MAKEDOC @@ -71,21 +66,6 @@ struct option_t { /* build complete documentation */ -#ifdef _MAKEDOC -# ifndef USE_LIBESMTP -# define USE_LIBESMTP -# endif -# ifndef USE_NNTP -# define USE_NNTP -# endif -# ifndef USE_HCACHE -# define USE_HCACHE -# endif -# ifndef HAVE_LIBIDN -# define HAVE_LIBIDN -# endif -#endif - struct option_t MuttVars[] = { /*++*/ {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" }, @@ -128,32 +108,6 @@ struct option_t MuttVars[] = { ** Controls whether 8-bit data is converted to 7-bit using either ** \fTquoted-printable\fP or \fTbase64\fP encoding when sending mail. */ - {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, "no" }, - /* - ** .pp - ** Controls whether ANSI color codes in messages (and color tags in - ** rich text messages) are to be interpreted. - ** Messages containing these codes are rare, but if this option is set, - ** their text will be colored accordingly. Note that this may override - ** your color choices, and even present a security problem, since a - ** 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 @@ -166,26 +120,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. */ -#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 @@ -278,26 +212,6 @@ struct option_t MuttVars[] = { ** \fTDelivered-To:\fP header fields when bouncing messages. ** Postfix users may wish to \fIunset\fP this variable. */ - { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, "no" }, - /* - ** .pp - ** When this variable is set, mutt will place the cursor at the beginning - ** of the current line in menus, even when the arrow_cursor variable - ** is unset, making it easier for blind persons using Braille displays to - ** 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 {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" }, /* ** .pp @@ -375,23 +289,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_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"}, /* @@ -586,28 +484,6 @@ struct option_t MuttVars[] = { ** sent to both the list and your address, resulting in two copies ** of the same email for you. */ -#ifdef USE_NNTP - {"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. - */ -#endif - {"force_name", DT_BOOL, R_NONE, OPTFORCENAME, "no" }, - /* - ** .pp - ** This variable is similar to ``$$save_name'', except that Madmutt will - ** store a copy of your outgoing message by the username of the address - ** you are sending to even if that mailbox does not exist. - ** .pp - ** Also see the ``$$record'' variable. - */ {"force_buffy_check", DT_BOOL, R_NONE, OPTFORCEBUFFYCHECK, "no" }, /* ** .pp @@ -646,38 +522,6 @@ struct option_t MuttVars[] = { ** message (when ``$$mime_forward'' is \fIunset\fP) will be quoted using ** ``$$indent_string''. */ -#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 @@ -685,18 +529,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 @@ -809,13 +641,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 @@ -871,14 +696,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 @@ -917,12 +734,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 @@ -999,24 +810,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 {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" }, /* ** .pp @@ -1053,19 +846,6 @@ struct option_t MuttVars[] = { ** maximum line length is determined by the terminal width and $$wrapmargin. */ #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. - */ #if defined(HAVE_GDBM) {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, "16384"}, /* @@ -1141,12 +921,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 @@ -1218,32 +992,6 @@ struct option_t MuttVars[] = { ** This variable controls the number of lines of context that are given ** when scrolling through menus. (Similar to ``$$pager_context''.) */ - {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, "yes" }, - /* - ** .pp - ** When \fIunset\fP, the bottom entry of menus will never scroll up past - ** the bottom of the screen, unless there are less entries than lines. - ** When \fIset\fP, the bottom entry may move off the bottom. - */ - {"menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, "no" }, - /* - ** .pp - ** When \fIset\fP, menus will be scrolled up or down one line when you - ** attempt to move across a screen boundary. If \fIunset\fP, the screen - ** 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 @@ -1295,28 +1043,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. */ - {"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 @@ -1367,120 +1093,6 @@ 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"}, - /* - ** .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. - */ - {"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_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 @@ -1528,103 +1140,11 @@ 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" }, + {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "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) - */ - {"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_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) - */ - {"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_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" }, - /* - ** .pp - ** If \fIset\fP, signed and encrypted messages will consist of nested - ** multipart/signed and multipart/encrypted body parts. + ** If \fIset\fP, signed and encrypted messages will consist of nested + ** multipart/signed and multipart/encrypted body parts. ** .pp ** This is useful for applications like encrypted and signed mailing ** lists, where the outer layer (multipart/encrypted) can be easily @@ -1664,17 +1184,6 @@ struct option_t MuttVars[] = { ** ``reverse-''. ** (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! */ {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, /* ** .pp @@ -1701,141 +1210,6 @@ struct option_t MuttVars[] = { ** keyid (the hash-value that OpenSSL generates) to work properly ** (S/MIME only) */ -#if defined(USE_LIBESMTP) - {"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_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_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 - {"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 - */ - {"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. - */ - {"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 - */ {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" }, /* ** .pp @@ -1875,14 +1249,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_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" }, /* ** .pp @@ -1938,21 +1304,6 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ -#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). - ** .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. - */ -#endif {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" }, /* ** .pp @@ -2074,11 +1425,6 @@ struct option_t MuttVars[] = { ** .pp ** Also see the ``$$write_inc'' variable. */ - {"read_only", DT_BOOL, R_NONE, OPTREADONLY, "no" }, - /* - ** .pp - ** If set, all folders are opened in read-only mode. - */ {"realname", DT_STR, R_BOTH, UL &Realname, "" }, /* ** .pp @@ -2107,13 +1453,6 @@ struct option_t MuttVars[] = { ** and replying. The default value corresponds to the English ``Re:'' and ** the German ``Aw:''. */ - {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, "no" }, - /* - ** .pp - ** If \fIunset\fP and you are replying to a message sent by you, Madmutt will - ** assume that you want to reply to the recipients of that message rather - ** than to yourself. - */ {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, "ask-yes" }, /* ** .pp @@ -2171,99 +1510,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 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. - */ -#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 @@ -2499,12 +1745,6 @@ struct option_t MuttVars[] = { ** will replace any dots in the expansion by underscores. This might be helpful ** with IMAP folders that don't like dots in folder names. */ - {"status_on_top", DT_BOOL, R_BOTH, OPTSTATUSONTOP, "no" }, - /* - ** .pp - ** Setting this variable causes the ``status bar'' to be displayed on - ** the first line of the screen rather than near the bottom. - */ {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, "yes" }, /* ** @@ -2552,13 +1792,6 @@ struct option_t MuttVars[] = { ** i.e. a space will be inserted between the quote characters and the actual ** text. */ - {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, "yes" }, - /* - ** .pp - ** When \fIunset\fP, Madmutt won't stop when the user presses the terminal's - ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Madmutt - ** inside an xterm using a command like ``\fTxterm -e madmutt\fP.'' - */ {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, "no" }, /* ** .pp @@ -2660,13 +1893,6 @@ struct option_t MuttVars[] = { ** This variable only affects decoding. */ #endif /* HAVE_LIBIDN */ - {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, "yes" }, - /* - ** .pp - ** When \fIset\fP, Madmutt will look for IPv6 addresses of hosts it tries to - ** contact. If this option is \fIunset\fP, Madmutt will restrict itself to IPv4 addresses. - ** Normally, the default should work. - */ {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" }, /* ** .pp @@ -2759,15 +1985,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 \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. + ** 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 + ** 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 /*--*/ @@ -2854,7 +2237,6 @@ struct command_t Commands[] = { {"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}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, @@ -2872,11 +2254,9 @@ 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}, {"attachments", parse_attachments, 0 }, {"my_hdr", parse_my_hdr, 0},