X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=de6c9dca6907150bcb2cf80ac5586149cddeb13a;hp=1676acd0b9be9362f1a9d56a0560e8d2e4695c0d;hb=7480539010bab6905c944b11b036492a1a625994;hpb=68e9c3fe5664c1e13093e24dd15415ac000af70c diff --git a/init.h b/init.h index 1676acd..de6c9dc 100644 --- a/init.h +++ b/init.h @@ -105,6 +105,21 @@ struct feature_t { # ifndef USE_GNUTLS # define USE_GNUTLS # endif +# ifndef USE_DOTLOCK +# define USE_DOTLOCK +# endif +# ifndef DL_STANDALONE +# define DL_STANDALONE +# 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[] = { @@ -210,7 +225,8 @@ struct option_t MuttVars[] = { ** This variable is valid only if $$strict_mime is unset. */ #ifdef USE_NNTP - {"ask_follow_up", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0}, + {"ask_followup_to", DT_SYN, R_NONE, UL "nntp_ask_followup_to", 0}, + {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0}, /* ** .pp ** Availability: NNTP @@ -219,7 +235,8 @@ struct option_t MuttVars[] = { ** If \fIset\fP, Mutt-ng will prompt you for the \fTFollowup-To:\fP header ** field before editing the body of an outgoing news article. */ - {"ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, 0}, + {"ask_x_comment_to", DT_SYN, R_NONE, UL "nntp_ask_x_comment_to", 0}, + {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, 0}, /* ** .pp ** Availability: NNTP @@ -321,8 +338,18 @@ 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, 0 }, + /* + ** .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 - {"catchup_newsgroup", DT_QUAD, R_NONE, OPT_CATCHUP, M_ASKYES}, + {"catchup_newsgroup", DT_SYN, R_NONE, UL "nntp_catchup", 0}, + {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, M_ASKYES}, /* ** .pp ** Availability: NNTP @@ -552,9 +579,6 @@ struct option_t MuttVars[] = { ** This option allows you to edit the header of your outgoing messages ** along with the body of your message. */ - {"edit_hdrs", DT_SYN, R_NONE, UL "edit_headers", 0}, - /* - */ {"editor", DT_PATH, R_NONE, UL &Editor, 0}, /* ** .pp @@ -676,7 +700,8 @@ struct option_t MuttVars[] = { ** of the same email for you. */ #ifdef USE_NNTP - {"followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, M_ASKYES}, + {"followup_to_poster", DT_SYN, R_NONE, UL "nntp_followup_to_poster", 0}, + {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, M_ASKYES}, /* ** .pp ** Availability: NNTP @@ -715,9 +740,6 @@ struct option_t MuttVars[] = { ** This variable is only used, if ``$$mime_forward'' is \fIunset\fP, ** otherwise ``$$mime_forward_decode'' is used instead. */ - {"forw_decode", DT_SYN, R_NONE, UL "forward_decode", 0}, - /* - */ {"forward_edit", DT_QUAD, R_NONE, OPT_FORWEDIT, M_YES}, /* ** .pp @@ -731,9 +753,6 @@ struct option_t MuttVars[] = { ** This variable controls the default subject when forwarding a message. ** It uses the same format sequences as the ``$$index_format'' variable. */ - {"forw_format", DT_SYN, R_NONE, UL "forward_format", 0}, - /* - */ {"forward_quote", DT_BOOL, R_NONE, OPTFORWQUOTE, 0}, /* ** .pp @@ -741,9 +760,6 @@ struct option_t MuttVars[] = { ** message (when ``$$mime_forward'' is \fIunset\fP) will be quoted using ** ``$$indent_string''. */ - {"forw_quote", DT_SYN, R_NONE, UL "forward_quote", 0}, - /* - */ {"from", DT_ADDR, R_NONE, UL &From, UL 0}, /* ** .pp @@ -774,7 +790,8 @@ struct option_t MuttVars[] = { ** ``Franklin'' to ``Franklin, Steve''. */ #ifdef USE_NNTP - {"group_index_format", DT_STR, R_BOTH, UL &GroupFormat, UL "%4C %M%N %5s %-45.45f %d"}, + {"group_index_format", DT_SYN, R_NONE, UL "nntp_group_index_format", 0}, + {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, UL "%4C %M%N %5s %-45.45f %d"}, /* ** .pp ** Availability: NNTP @@ -797,9 +814,6 @@ struct option_t MuttVars[] = { ** .te */ #endif - {"hdr_format", DT_SYN, R_NONE, UL "index_format", 0}, - /* - */ {"hdrs", DT_BOOL, R_NONE, OPTHDRS, 1}, /* ** .pp @@ -885,8 +899,10 @@ struct option_t MuttVars[] = { /* ** .pp ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail - ** addresses. This overrides the compile time definition obtained from - ** \fT/etc/resolv.conf\fP. + ** 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, 0}, /* @@ -986,6 +1002,16 @@ struct option_t MuttVars[] = { ** Reduce this number if you find yourself ** getting disconnected from your IMAP server due to inactivity. */ + {"imap_login", DT_STR, R_NONE, UL &ImapLogin, 0 }, + /* + ** .pp + ** Availability: IMAP + ** + ** .pp + ** Your login name on the IMAP server. + ** .pp + ** This variable defaults to the value of ``$$imap_user.'' + */ {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, 0}, /* ** .pp @@ -996,15 +1022,12 @@ struct option_t MuttVars[] = { ** only subscribed folders or all folders. This can be toggled in the ** IMAP browser with the \fItoggle-subscribed\fP function. */ - {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, 5}, + {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, 300}, /* ** .pp ** This variable configures how often (in seconds) Mutt-ng should look for ** new mail in IMAP folders. This is split from the ``$mail_check'' variable ** to generate less traffic and get more accurate information for local folders. - ** .pp - ** It defaults to the default value of ``$mail_check'' which is 5 seconds. But - ** you may want to increase it. */ {"imap_pass", DT_STR, R_NONE, UL &ImapPass, UL 0}, /* @@ -1069,7 +1092,8 @@ struct option_t MuttVars[] = { ** Availability: IMAP ** ** .pp - ** Your login name on the IMAP server. + ** The name of the user whose mail you intend to access on the IMAP + ** server. ** .pp ** This variable defaults to your user name on the local machine. */ @@ -1102,9 +1126,6 @@ struct option_t MuttVars[] = { ** message to which you are replying. You are strongly encouraged not to ** change this value, as it tends to agitate the more fanatical netizens. */ - {"indent_str", DT_SYN, R_NONE, UL "indent_string", 0}, - /* - */ {"index_format", DT_STR, R_BOTH, UL &HdrFmt, UL "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"}, /* ** .pp @@ -1174,7 +1195,8 @@ struct option_t MuttVars[] = { ** See also: ``$$to_chars''. */ #ifdef USE_NNTP - {"inews", DT_PATH, R_NONE, UL &Inews, UL ""}, + {"inews", DT_SYN, R_NONE, UL "nntp_inews", 0}, + {"nntp_inews", DT_PATH, R_NONE, UL &Inews, UL ""}, /* ** .pp ** Availability: NNTP @@ -1259,8 +1281,8 @@ struct option_t MuttVars[] = { ** .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 and so no - ** header caching will be done. + ** 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, 1}, /* @@ -1272,6 +1294,7 @@ struct option_t MuttVars[] = { ** files when the header cache is in use. This incurs one \fTstat(2)\fP per ** message every time the folder is opened. */ +#if HAVE_GDBM || HAVE_DB4 {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384"}, /* ** .pp @@ -1283,9 +1306,19 @@ struct option_t MuttVars[] = { ** Too large ** or too small of a page size for the common header can waste ** space, memory effectiveness, or CPU time. The default should be more or - ** less the best you can get. For details google after Mutt-ng maildir header + ** less the best you can get. For details google for mutt header ** cache (first hit). */ +#endif /* HAVE_GDBM || HAVE_DB 4 */ +#if HAVE_QDBM + { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 }, + /* + ** .pp + ** If enabled the header cache will be compressed. So only one fifth of the usual + ** diskspace is used, but the uncompression can result in a slower open of the + ** cached folder. + */ +#endif /* HAVE_QDBM */ #endif /* USE_HCACHE */ {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0}, /* @@ -1367,7 +1400,7 @@ struct option_t MuttVars[] = { ** .pp ** If \fIset\fP, only folders with new mail will be shown in the sidebar. */ - {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, UL "%c%?n?(%n)?%?f?[%f]?"}, + {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, UL "%m%?n?(%n)?%?f?[%f]?"}, /* ** .pp ** This variable controls how message counts are printed when the sidebar @@ -1375,15 +1408,20 @@ struct option_t MuttVars[] = { ** will be printed \fIand\fP mutt-ng won't frequently count mail (which ** may be a great speedup esp. with mbox-style mailboxes.) ** .pp - ** The following \fTprintf(3)\fP-like sequences are supported: + ** The following \fTprintf(3)\fP-like sequences are supported all of which + ** may be printed non-zero: ** .pp ** .dl - ** .dt %c .dd Total number of messages. - ** .dt %f .dd Number of flagged messages. + ** .dt %d .dd Number of deleted messages. 1) + ** .dt %F .dd Number of flagged messages. + ** .dt %m .dd Total number of messages. + ** .dt %M .dd Total number of messages shown, i.e. not hidden by a limit. 1) ** .dt %n .dd Number of new messages. + ** .dt %t .dd Number of tagged messages. 1) ** .de ** .pp - ** The \fT%f\fP and \fT%n\fP expandos may optionally be printed non-zero. + ** 1) These expandos only have a non-zero value for the current mailbox and + ** will always be zero otherwise. */ {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, 0}, /* @@ -1416,7 +1454,7 @@ 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, 0}, + {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, 1}, /* ** .pp ** When \fIunset\fP, the bottom entry of menus will never scroll up past @@ -1486,10 +1524,6 @@ struct option_t MuttVars[] = { ** forwarding a message while ``$$mime_forward'' is \fIset\fP. Otherwise ** ``$$forward_decode'' is used instead. */ - {"mime_fwd", DT_SYN, R_NONE, UL "mime_forward", 0}, - /* - */ - {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, M_YES}, /* ** .pp @@ -1499,7 +1533,8 @@ struct option_t MuttVars[] = { */ #ifdef USE_NNTP - {"mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, 1}, + {"mime_subject", DT_SYN, R_NONE, UL "nntp_mime_subject", 0}, + {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, 1}, /* ** .pp ** Availability: NNTP @@ -1556,15 +1591,12 @@ struct option_t MuttVars[] = { ** attachments of type \fTmessage/rfc822\fP. For a full listing of defined ** \fTprintf(3)\fP-like sequences see the section on ``$$index_format''. */ - {"msg_format", DT_SYN, R_NONE, UL "message_format", 0}, - /* - */ {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, UL "%Y%m%d%h%M%s.G%P%p"}, /* ** .pp ** This is the format for the ``local part'' of the \fTMessage-Id:\fP header - ** field generated - ** by Mutt-ng. The format string contains of one or more characters. The '%' + ** field generated by Mutt-ng. If this variable is empty, no \fTMessage-Id:\fP + ** headers will be generated. The '%' ** character marks that certain data will be added to the string, similar to ** \fTprintf(3)\fP. The following characters are allowed: ** .pp @@ -1596,7 +1628,8 @@ struct option_t MuttVars[] = { ** deeper threads to fit on the screen. */ #ifdef USE_NNTP - {"news_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, UL "~/.muttng"}, + {"news_cache_dir", DT_SYN, R_NONE, UL "nntp_cache_dir", 0}, + {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, UL "~/.muttng"}, /* ** .pp ** Availability: NNTP @@ -1609,7 +1642,8 @@ struct option_t MuttVars[] = { ** As for the header caching in connection with IMAP and/or Maildir, ** this drastically increases speed and lowers traffic. */ - {"news_server", DT_STR, R_NONE, UL &NewsServer, 0}, + {"news_server", DT_SYN, R_NONE, UL "nntp_host", 0}, + {"nntp_host", DT_STR, R_NONE, UL &NewsServer, 0}, /* ** .pp ** Availability: NNTP @@ -1630,7 +1664,8 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"newsrc", DT_PATH, R_NONE, UL &NewsRc, UL "~/.newsrc"}, + {"newsrc", DT_SYN, R_NONE, UL "nntp_newsrc", 0}, + {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, UL "~/.newsrc"}, /* ** .pp ** Availability: NNTP @@ -1653,7 +1688,7 @@ struct option_t MuttVars[] = { ** ** .pp ** This variable controls how many news articles to cache per newsgroup - ** (if caching is enabled, see $$news_cache_dir) and how many news articles + ** (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 @@ -1689,7 +1724,8 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"nntp_poll", DT_NUM, R_NONE, UL &NewsPollTimeout, 60}, + {"nntp_poll", DT_SYN, R_NONE, UL "nntp_mail_check", 0}, + {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, 60}, /* ** .pp ** Availability: NNTP @@ -1760,7 +1796,6 @@ struct option_t MuttVars[] = { ** when you are at the end of a message and invoke the \fInext-page\fP ** function. */ - {"pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0}, {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0}, /* ** .pp @@ -1772,7 +1807,6 @@ struct option_t MuttVars[] = { ** be overridden by use of the \fIsmime-menu\fP. ** (Crypto only) */ - {"pgp_autoencrypt", DT_SYN, R_NONE, UL "crypt_autoencrypt", 0}, {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, 0}, /* ** .pp @@ -1793,7 +1827,6 @@ struct option_t MuttVars[] = { ** if you want to play interesting key selection games. ** (PGP only) */ - {"pgp_replyencrypt", DT_SYN, R_NONE, UL "crypt_replyencrypt", 1}, {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, 1}, /* ** .pp @@ -1801,7 +1834,6 @@ struct option_t MuttVars[] = { ** encrypted. ** (Crypto only) */ - {"pgp_replysign", DT_SYN, R_NONE, UL "crypt_replysign", 0}, {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, 0}, /* ** .pp @@ -1811,7 +1843,6 @@ struct option_t MuttVars[] = { ** \fBNote:\fP this does not work on messages that are encrypted \fBand\fP signed! ** (Crypto only) */ - {"pgp_replysignencrypted", DT_SYN, R_NONE, UL "crypt_replysignencrypted", 0}, {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, 0}, /* ** .pp @@ -1838,7 +1869,6 @@ struct option_t MuttVars[] = { ** If \fIset\fP, Mutt-ng will use a possibly-running gpg-agent process. ** (PGP only) */ - {"pgp_verify_sig", DT_SYN, R_NONE, UL "crypt_verify_sig", 0}, {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, M_YES}, /* ** .pp @@ -1931,7 +1961,6 @@ struct option_t MuttVars[] = { ** removed, while the inner multipart/signed part is retained. ** (PGP only) */ - {"pgp_create_traditional", DT_SYN, R_NONE, UL "pgp_autoinline", 0}, {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0}, /* ** .pp @@ -1950,7 +1979,6 @@ struct option_t MuttVars[] = { ** \fBdeprecated\fP. ** (PGP only) */ - {"pgp_auto_traditional", DT_SYN, R_NONE, UL "pgp_replyinline", 0}, {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0}, /* ** .pp @@ -2168,10 +2196,6 @@ struct option_t MuttVars[] = { ** ``$$mime_forward_decode'' is \fIunset\fP. ** (PGP only) */ - {"forw_decrypt", DT_SYN, R_NONE, UL "forward_decrypt", 0}, - /* - */ - {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, 300}, /* ** .pp @@ -2314,7 +2338,6 @@ struct option_t MuttVars[] = { ** certificate was issued for the sender's mailbox). ** (S/MIME only) */ - {"smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0}, {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0}, /* ** .pp @@ -2369,7 +2392,7 @@ struct option_t MuttVars[] = { ** servers will probably desire 587, the mail submission port. */ #endif -#if defined(USE_SSL)||defined(USE_NSS)||defined(USE_GNUTLS) +#if defined(USE_SSL) || defined(USE_GNUTLS) #ifdef USE_SSL {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0}, /* @@ -2396,7 +2419,7 @@ struct option_t MuttVars[] = { {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"}, /* ** .pp - ** Availability: SSL or NSS or GNUTLS + ** Availability: SSL or GNUTLS ** ** .pp ** This variable specifies the file where the certificates you trust @@ -2411,11 +2434,11 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset certificate_file=~/.muttng/certificates\fP */ -# ifndef USE_GNUTLS +# if defined(_MAKEDOC) || !defined (USE_GNUTLS) {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1}, /* ** .pp - ** Availability: SSL or NSS + ** Availability: SSL ** ** .pp ** If set to \fIyes\fP, Mutt-ng will use CA certificates in the @@ -2425,7 +2448,7 @@ struct option_t MuttVars[] = { {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, 0}, /* ** .pp - ** Availability: SSL or NSS + ** Availability: SSL ** ** .pp ** The file which includes random data that is used to initialize SSL @@ -2434,7 +2457,7 @@ struct option_t MuttVars[] = { {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, 1}, /* ** .pp - ** Availability: SSL or NSS + ** Availability: SSL ** ** .pp ** This variables specifies whether to attempt to use SSLv2 in the @@ -2444,7 +2467,7 @@ struct option_t MuttVars[] = { {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1}, /* ** .pp - ** Availability: SSL or NSS or GNUTLS + ** Availability: SSL or GNUTLS ** ** .pp ** This variables specifies whether to attempt to use SSLv3 in the @@ -2453,7 +2476,7 @@ struct option_t MuttVars[] = { {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, 1}, /* ** .pp - ** Availability: SSL or NSS or GNUTLS + ** Availability: SSL or GNUTLS ** ** .pp ** This variables specifies whether to attempt to use TLSv1 in the @@ -2535,7 +2558,8 @@ struct option_t MuttVars[] = { ** methods are unavailable. If a method is available but authentication ** fails, Mutt-ng will not connect to the POP server. */ - {"pop_checkinterval", DT_NUM, R_NONE, UL &PopCheckTimeout, 60}, + {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0}, + {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, 60}, /* ** .pp ** Availability: POP @@ -2618,11 +2642,9 @@ struct option_t MuttVars[] = { ** Similar to the ``$$attribution'' variable, Mutt-ng will append this ** string after the inclusion of a message which is being replied to. */ - {"post_indent_str", DT_SYN, R_NONE, UL "post_indent_string", 0}, - /* - */ #ifdef USE_NNTP - {"post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, M_ASKYES}, + {"post_moderated", DT_SYN, R_NONE, UL "nntp_post_moderated", 0 }, + {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, M_ASKYES}, /* ** .pp ** Availability: NNTP @@ -2681,9 +2703,6 @@ struct option_t MuttVars[] = { ** .pp ** This specifies the command pipe that should be used to print messages. */ - {"print_cmd", DT_SYN, R_NONE, UL "print_command", 0}, - /* - */ {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, 1}, /* ** .pp @@ -3000,7 +3019,8 @@ struct option_t MuttVars[] = { ** shell from \fT/etc/passwd\fP is used. */ #ifdef USE_NNTP - {"save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, 0}, + {"save_unsubscribed", DT_SYN, R_NONE, UL "nntp_save_unsubscribed", 0 }, + {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, 0}, /* ** .pp ** Availability: NNTP @@ -3010,9 +3030,9 @@ struct option_t MuttVars[] = { ** ``newsrc'' file and into the news cache. */ #endif - {"shorten_hierarchy", DT_SYN, R_NONE, UL "sidebar_shorten_hierarchy", 0 }, #ifdef USE_NNTP - {"show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, 1}, + {"show_new_news", DT_SYN, R_NONE, UL "nntp_show_new_news", 0 }, + {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, 1}, /* ** .pp ** Availability: NNTP @@ -3023,7 +3043,8 @@ struct option_t MuttVars[] = { ** Also controls whether or not the number of new articles of subscribed ** newsgroups will be checked. */ - {"show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, 0}, + {"show_only_unread", DT_SYN, R_NONE, UL "nntp_show_only_unread", 0 }, + {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, 0}, /* ** .pp ** Availability: NNTP @@ -3299,6 +3320,20 @@ struct option_t MuttVars[] = { ** 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, 1}, + /* + ** + ** .pp + ** With mailto: style links, a body as well as arbitrary header information + ** may be embedded. This may lead to (user) headers being overwriten without note + ** if ``$$edit_headers'' is unset. + ** + ** .pp + ** If this variable is \fIset\fP, mutt-ng is strict and allows anything to be + ** changed. If it's \fIunset\fP, all headers given will be prefixed with + ** ``X-Mailto-'' and the message including headers will be shown in the editor + ** regardless of what ``$$edit_headers'' is set to. + **/ {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, 1}, /* ** .pp @@ -3563,6 +3598,20 @@ struct option_t MuttVars[] = { ** (as long as you're in an appropriate terminal). The default must ** be \fIunset\fP to force in the validity checking. */ + {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, UL "" }, + /* + ** .pp + ** If $$xterm_set_titles is \fIset\fP, this string will be used to + ** set the title when leaving mutt-ng. For terminal-based programs, + ** there's no easy and portable way to read the current title so mutt-ng + ** cannot read it upon startup and restore it when exiting. + ** + ** .pp + ** Based on the xterm FAQ, the following might work: + ** + ** .pp + ** \fTset xterm_leave = "`test x$$$DISPLAY != x && xprop -id $$$WINDOWID | grep WM_NAME | cut -d '"' -f 2`"\fP + */ {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, UL "Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?"}, /* ** .pp @@ -3571,7 +3620,8 @@ struct option_t MuttVars[] = { ** to the one used by ``$$status_format''. */ #ifdef USE_NNTP - {"x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, 0}, + {"x_comment_to", DT_SYN, R_NONE, UL "nntp_x_comment_to", 0}, + {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, 0}, /* ** .pp ** Availability: NNTP @@ -3595,120 +3645,137 @@ const struct feature_t Features[] = { #endif }, {"slang", #ifdef USE_SLANG_CURSES - 1 + 1 #else - 0 + 0 #endif - }, {"iconv", + }, {"iconv", #ifdef _LIBICONV_VERSION - 1 + 1 #else - 0 + 0 #endif - }, {"idn", + }, {"idn", #ifdef HAVE_LIBIDN - 1 + 1 #else - 0 + 0 #endif - }, {"dotlock", + }, {"dotlock", #ifdef USE_DOTLOCK - 1 + 1 #else - 0 + 0 #endif - }, {"standalone", + }, {"standalone", #ifdef DL_STANDALONE - 1 + 1 #else - 0 + 0 #endif - }, {"pop", + }, {"pop", #ifdef USE_POP - 1 + 1 #else - 0 + 0 #endif - }, {"nntp", + }, {"nntp", #ifdef USE_NNTP - 1 + 1 #else - 0 + 0 #endif - }, {"imap", + }, {"imap", #ifdef USE_IMAP - 1 + 1 #else - 0 + 0 #endif - }, {"ssl", + }, {"ssl", #ifdef USE_SSL - 1 + 1 #else - 0 + 0 #endif - }, {"gnutls", + }, {"gnutls", #ifdef USE_GNUTLS - 1 + 1 #else - 0 + 0 #endif - }, {"sasl", + }, {"sasl", #ifdef USE_SASL - 1 + 1 #else - 0 + 0 #endif - }, {"sasl2", + }, {"sasl2", #ifdef USE_SASL2 - 1 + 1 #else - 0 + 0 #endif - }, {"libesmtp", + }, {"libesmtp", #ifdef USE_LIBESMTP - 1 + 1 #else - 0 + 0 #endif - }, {"compressed", + }, {"compressed", #ifdef USE_COMPRESSED - 1 + 1 #else - 0 + 0 #endif - }, {"color", + }, {"color", #ifdef HAVE_COLOR - 1 + 1 #else - 0 + 0 #endif - }, - {"classic_pgp", + }, {"classic_pgp", #ifdef CRYPT_BACKEND_CLASSIC_PGP - 1 + 1 #else - 0 + 0 #endif - }, {"classic_smime", + }, {"classic_smime", #ifdef CRYPT_BACKEND_CLASSIC_SMIME - 1 + 1 #else - 0 + 0 #endif - }, {"gpgme", + }, {"gpgme", #ifdef CRYPT_BACKEND_GPGME - 1 + 1 #else - 0 + 0 #endif - }, {"header_cache", + }, {"header_cache", #ifdef USE_HCACHE - 1 + 1 +#else + 0 +#endif + }, {"qdbm", +#ifdef HAVE_QDBM + 1 +#else + 0 +#endif + }, {"gdbm", +#ifdef HAVE_GDBM + 1 #else - 0 + 0 +#endif + }, {"db4", +#ifdef HAVE_DB4 + 1 +#else + 0 #endif - }, + }, /* last */ {NULL, 0} }; @@ -3835,8 +3902,8 @@ struct command_t Commands[] = { {"ignore", parse_ignore, 0}, {"lists", parse_lists, 0}, {"macro", mutt_parse_macro, 0}, - {"mailboxes", mutt_parse_mailboxes, M_MAILBOXES}, - {"unmailboxes", mutt_parse_mailboxes, M_UNMAILBOXES}, + {"mailboxes", buffy_parse_mailboxes, M_MAILBOXES}, + {"unmailboxes", buffy_parse_mailboxes, M_UNMAILBOXES}, {"message-hook", mutt_parse_hook, M_MESSAGEHOOK}, {"mbox-hook", mutt_parse_hook, M_MBOXHOOK}, {"mime_lookup", parse_list, UL &MimeLookupList},