# 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[] = {
** 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
** 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
** 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
** 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
** 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
** 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
** 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
** 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
** ``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
** .te
*/
#endif
- {"hdr_format", DT_SYN, R_NONE, UL "index_format", 0},
- /*
- */
{"hdrs", DT_BOOL, R_NONE, OPTHDRS, 1},
/*
** .pp
** 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
** 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},
/*
** 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.
*/
** 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
** 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
** .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
** 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},
/*
** 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
** 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
*/
#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
** 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
** 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
** 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
** 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
**
** .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
** 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
** 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
** 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
** 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
** encrypted.
** (Crypto only)
*/
- {"pgp_replysign", DT_SYN, R_NONE, UL "crypt_replysign", 0},
{"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, 0},
/*
** .pp
** \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
** 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
** 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
** \fBdeprecated\fP.
** (PGP only)
*/
- {"pgp_auto_traditional", DT_SYN, R_NONE, UL "pgp_replyinline", 0},
{"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0},
/*
** .pp
** ``$$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
** 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
** 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},
/*
{"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
** .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
{"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
{"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
{"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
{"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
** 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
** 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
** .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
** 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
** ``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
** 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
** 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
** (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
** 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
projects / apps / madmutt.git / blobdiff