From: pdmef Date: Mon, 8 Aug 2005 10:11:02 +0000 (+0000) Subject: Rocco Rutte: X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=e01486aabea6f0af36933158bd58b9ab03b30add Rocco Rutte: - merge in some latest mutt changes git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@378 e385b8ad-14ed-0310-8656-cc95a2468c6d --- diff --git a/ChangeLog.mutt b/ChangeLog.mutt index 90a1e38..fc3a9d5 100644 --- a/ChangeLog.mutt +++ b/ChangeLog.mutt @@ -1,3 +1,61 @@ +2005-08-08 03:30:59 Brendan Cully (brendan) + + * browser.c: Avoid a segfault attempting to browse an invalid IMAP + URL. + + * imap/imap.c: Extend IMAP host completion to complete over open + connections. + + * imap/imap.c: Allow IMAP tab-completion to complete over defined + mailboxes, saving a bunch of typing for the hostname part of the + URL. Should probably be extended to complete over open connections + and possibly also folder/account hooks. + + * account.c, curs_lib.c, protos.h: Reuse mutt_get_field for + mutt_get_field_unbuffered. + +2005-08-07 06:20:37 Anders Helmersson (brendan) + + * pager.c: Certain versions of libc may segfault during regex + processing if given incomplete multibyte characters. Work around + this by manually trimming the display buffer. I modified it + somewhat to only check when the situation is most likely to occur: + fgets has read all the way to the capacity of the buffer. Thanks + also to Tamo for his comments. + +2005-08-07 04:58:12 Brendan Cully (brendan) + + * account.c, curs_lib.c, protos.h: Make username prompts + unbuffered like password prompts are (no more folder-hook push + garbage) + +2005-08-06 22:20:55 Brendan Cully (brendan) + + * imap/imap.c, lib.c, lib.h, mutt.h, mutt_tunnel.c, sendlib.c: + Report non-zero exit status of tunnel command. Closes: #1749. + + * imap/imap.c, imap/util.c, init.h, mutt.h, pop_lib.c: Replace + pointless imap_force_ssl option with ssl_force_tls, which requires + any connection (POP or IMAP) to a remote server to be encrypted, + and attempts to negotiate encryption even if the capability isn't + advertised (this last bit is of dubious utility, but essentially + harmless since the connection would otherwise fail + anyway). Closes: #1284. + + * imap/browse.c: Kill a warning. + +2005-08-06 19:06:36 Brendan Cully (brendan) + + * init.c: Use isalnum instead of isalpha when parsing unbraced + environment variable names, per tamo's suggestion. Closes #2022. + +2005-08-05 02:16:46 Brendan Cully (brendan) + + * attach.c, attach.h, browser.c, curs_main.c, mutt.h, mutt_menu.h, + pager.h, protos.h: Move some attachment-related prototypes and + structures into attach.h from the global headers. A small step + towards sane dependency tracking and code cleanliness. + 2005-08-04 01:15:52 Brendan Cully (brendan) * compose.c: Don't unlink non-mutt files that would have been diff --git a/UPGRADING b/UPGRADING index a3f0c35..0e2c23f 100644 --- a/UPGRADING +++ b/UPGRADING @@ -10,6 +10,11 @@ This document is not the place for verbose documentation; it only offers the necessary keywords to look them up in the manual, ChangeLog or other sources of information. +2005-08-08: + + The $imap_force_ssl option has been replaced with the more generic + $ssl_force_tls option. + 2005-08-07: For $sidebar_number_format, the expandos %c and %f are replaced with diff --git a/account.c b/account.c index b96de37..a5b4ff9 100644 --- a/account.c +++ b/account.c @@ -159,7 +159,8 @@ int mutt_account_getuser (ACCOUNT * account) else { snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host); strfcpy (account->user, NONULL (Username), sizeof (account->user)); - if (mutt_get_field (prompt, account->user, sizeof (account->user), 0)) + if (mutt_get_field_unbuffered (prompt, account->user, + sizeof (account->user), 0)) return -1; } @@ -217,7 +218,8 @@ int mutt_account_getpass (ACCOUNT * account) account->flags & M_ACCT_LOGIN ? account->login : account->user, account->host); account->pass[0] = '\0'; - if (mutt_get_password (prompt, account->pass, sizeof (account->pass))) + if (mutt_get_field_unbuffered (prompt, account->pass, + sizeof (account->pass), M_PASS)) return -1; } diff --git a/browser.c b/browser.c index 1692548..5cfd37e 100644 --- a/browser.c +++ b/browser.c @@ -770,8 +770,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (imap_is_magic (f, NULL) == M_IMAP) { init_state (&state, NULL); state.imap_browse = 1; - imap_browse (f, &state); - strfcpy (LastDir, state.folder, sizeof (LastDir)); + if (!imap_browse (f, &state)) + strfcpy (LastDir, state.folder, sizeof (LastDir)); } else { #endif diff --git a/curs_lib.c b/curs_lib.c index 9f77340..87d8721 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -137,16 +137,14 @@ int _mutt_get_field ( /* const */ char *field, char *buf, size_t buflen, return (ret); } -int mutt_get_password (char *msg, char *buf, size_t buflen) +int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags) { int rc; - CLEARLINE (LINES - 1); - addstr (msg); set_option (OPTUNBUFFEREDINPUT); - rc = mutt_enter_string (buf, buflen, LINES - 1, mutt_strlen (msg), M_PASS); + rc = mutt_get_field (msg, buf, buflen, flags); unset_option (OPTUNBUFFEREDINPUT); - CLEARLINE (LINES - 1); + return (rc); } diff --git a/doc/manual.txt b/doc/manual.txt index 6c4d120..5516c11 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -497,7 +497,7 @@ _2_._5_._3 _T_h_r_e_a_d_e_d _M_o_d_e - When the mailbox is _s_o_r_t_e_d (section 6.4.289 , page 149) by _t_h_r_e_a_d_s, there are + When the mailbox is _s_o_r_t_e_d (section 6.4.288 , page 149) by _t_h_r_e_a_d_s, there are a few additional functions available in the _i_n_d_e_x and _p_a_g_e_r modes. ^D delete-thread delete all messages in the current thread @@ -518,8 +518,8 @@ NNoottee:: Collapsing a thread displays only the first message in the thread and hides the others. This is useful when threads contain so many messages that you can only see a handful of threads on the screen. See %M in _$_i_n_d_e_x___f_o_r_m_a_t (sec- - tion 6.4.110 , page 105). For example, you could use "%?M?(#%03M)&(%4l)?" in - _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105) to optionally display the number of + tion 6.4.109 , page 105). For example, you could use "%?M?(#%03M)&(%4l)?" in + _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105) to optionally display the number of hidden messages if the thread is collapsed. See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 6.4.309 , page 156). @@ -613,8 +613,8 @@ (default: |) Asks for an external Unix command and pipes the current or tagged message(s) to - it. The variables _$_p_i_p_e___d_e_c_o_d_e (section 6.4.200 , page 129), _$_p_i_p_e___s_p_l_i_t - (section 6.4.202 , page 129), _$_p_i_p_e___s_e_p (section 6.4.201 , page 129) and + it. The variables _$_p_i_p_e___d_e_c_o_d_e (section 6.4.199 , page 129), _$_p_i_p_e___s_p_l_i_t + (section 6.4.201 , page 129), _$_p_i_p_e___s_e_p (section 6.4.200 , page 129) and _$_w_a_i_t___k_e_y (section 6.4.332 , page 161) control the exact behavior of this function. @@ -642,7 +642,7 @@ ttooggggllee--qquuootteedd (default: T) - The _p_a_g_e_r uses the _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225 , page 134) variable to + The _p_a_g_e_r uses the _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.224 , page 134) variable to detect quoted text when displaying the body of the message. This function tog- gles the display of the quoted material in the message. It is particularly useful when are interested in just the response and there is a large amount of @@ -872,7 +872,7 @@ Pgp: [ E | S | S_<_i_d_> ] ``E'' encrypts, ``S'' signs and ``S'' signs with the given key, setting - _$_p_g_p___s_i_g_n___a_s (section 6.4.192 , page 127) permanently. + _$_p_g_p___s_i_g_n___a_s (section 6.4.191 , page 127) permanently. If you have told mutt to PGP encrypt a message, it will guide you through a key selection process when you try to send the message. Mutt-ng will not ask you @@ -890,7 +890,7 @@ encrypted using the selected public keys, and sent out. Most fields of the entries in the key selection menu (see also _$_p_g_p___e_n_t_r_y___f_o_r_- - _m_a_t (section 6.4.179 , page 124)) have obvious meanings. But some explana- + _m_a_t (section 6.4.178 , page 124)) have obvious meanings. But some explana- tions on the capabilities, flags, and validity fields are in order. The flags sequence (%f) will expand to one of the following flags: @@ -947,7 +947,7 @@ leave the menu, or accept them pressing (by default) the Return key. Note that different remailers do have different capabilities, indicated in the - %c entry of the remailer menu lines (see _$_m_i_x___e_n_t_r_y___f_o_r_m_a_t (section 6.4.139 , + %c entry of the remailer menu lines (see _$_m_i_x___e_n_t_r_y___f_o_r_m_a_t (section 6.4.138 , page 113)). Most important is the ``middleman'' capability, indicated by a capital ``M'': This means that the remailer in question cannot be used as the final element of a chain, but will only forward messages to other mixmaster @@ -1001,7 +1001,7 @@ At times it is desirable to delay sending a message that you have already begun to compose. When the _p_o_s_t_p_o_n_e_-_m_e_s_s_a_g_e function is used in the _c_o_m_p_o_s_e menu, the body of your message and attachments are stored in the mailbox specified by - the _$_p_o_s_t_p_o_n_e_d (section 6.4.214 , page 132) variable. This means that you can + the _$_p_o_s_t_p_o_n_e_d (section 6.4.213 , page 132) variable. This means that you can recall the message even if you exit Mutt-ng and then restart it at a later time. @@ -1019,7 +1019,7 @@ be in the same folder with the message you replied to for the status of the message to be updated. - See also the _$_p_o_s_t_p_o_n_e (section 6.4.213 , page 132) quad-option. + See also the _$_p_o_s_t_p_o_n_e (section 6.4.212 , page 132) quad-option. _3_. _C_o_n_f_i_g_u_r_a_t_i_o_n @@ -1299,7 +1299,7 @@ mailboxes to execute _c_o_m_m_a_n_d before loading. If a mailbox matches multiple folder-hook's, they are executed in the order given in the muttrc. - NNoottee:: if you use the ``!'' shortcut for _$_s_p_o_o_l_f_i_l_e (section 6.4.295 , page + NNoottee:: if you use the ``!'' shortcut for _$_s_p_o_o_l_f_i_l_e (section 6.4.294 , page 151) at the beginning of the pattern, you must place it inside of double or single quotes in order to distinguish it from the logical _n_o_t operator for the expression. @@ -1390,7 +1390,7 @@ +o normal - +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225 , page 134) in the + +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.224 , page 134) in the body of a message) +o quoted1, quoted2, ..., quotedNN (higher levels of quoting) @@ -1517,7 +1517,7 @@ instance, when replying to a message that you sent to a different party, mutt will automatically suggest to send the response to the original message's recipients -- responding to yourself won't make much sense in many cases. (See - _$_r_e_p_l_y___t_o (section 6.4.233 , page 136).) + _$_r_e_p_l_y___t_o (section 6.4.232 , page 136).) Many users receive e-mail under a number of different addresses. To fully use mutt's features here, the program must be able to recognize what e-mail @@ -1689,7 +1689,7 @@ executed, so if these names contain _s_h_o_r_t_c_u_t _c_h_a_r_a_c_t_e_r_s (section 4.9 , page 56) (such as ``='' and ``!''), any variable definition that affect these char- acters (like _$_f_o_l_d_e_r (section 6.4.64 , page 94) and _$_s_p_o_o_l_f_i_l_e (section - 6.4.295 , page 151)) should be executed before the mailboxes command. + 6.4.294 , page 151)) should be executed before the mailboxes command. _3_._1_5 _U_s_e_r _d_e_f_i_n_e_d _h_e_a_d_e_r_s @@ -1766,10 +1766,10 @@ Usage: fcc-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x This command is used to save outgoing mail in a mailbox other than _$_r_e_c_o_r_d - (section 6.4.230 , page 136). Mutt-ng searches the initial list of message + (section 6.4.229 , page 135). Mutt-ng searches the initial list of message recipients for the first matching _r_e_g_e_x_p and uses _m_a_i_l_b_o_x as the default Fcc: mailbox. If no match is found the message will be saved to _$_r_e_c_o_r_d (section - 6.4.230 , page 136) mailbox. + 6.4.229 , page 135) mailbox. See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1 , page 53) for information on the exact format of _p_a_t_t_e_r_n. @@ -1810,7 +1810,7 @@ send2-hook is matched every time a message is changed, either by editing it, or by using the compose menu to change its recipients or subject. send2-hook is executed after send-hook, and can, e.g., be used to set parameters such as the - _$_s_e_n_d_m_a_i_l (section 6.4.247 , page 140) variable depending on the message's + _$_s_e_n_d_m_a_i_l (section 6.4.246 , page 139) variable depending on the message's sender address. For each type of send-hook or reply-hook, when multiple matches occur, commands @@ -1823,8 +1823,8 @@ Example: send-hook mutt 'set mime_forward signature=''' Another typical use for this command is to change the values of the _$_a_t_t_r_i_b_u_- - _t_i_o_n (section 6.4.15 , page 84), _$_s_i_g_n_a_t_u_r_e (section 6.4.259 , page 143) and - _$_l_o_c_a_l_e (section 6.4.114 , page 108) variables in order to change the language + _t_i_o_n (section 6.4.15 , page 84), _$_s_i_g_n_a_t_u_r_e (section 6.4.258 , page 142) and + _$_l_o_c_a_l_e (section 6.4.113 , page 108) variables in order to change the language of the attributions and signatures based upon the recipients. NNoottee:: the send-hook's are only executed ONCE after getting the initial list of @@ -1928,10 +1928,10 @@ delete threshold, it will be marked as deleted. These three thresholds can be set via the variables _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g (sec- - tion 6.4.244 , page 139), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.245 , page 139), - _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 6.4.243 , page 139) and. By default, - _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.245 , page 139) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e - (section 6.4.243 , page 139) are set to -1, which means that in the default + tion 6.4.243 , page 139), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.244 , page 139), + _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 6.4.242 , page 139) and. By default, + _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.244 , page 139) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e + (section 6.4.242 , page 139) are set to -1, which means that in the default threshold configuration no message will ever get marked as read or deleted. Scoring gets especially interesting when combined with the color command and @@ -1958,7 +1958,7 @@ The Mutt Next Generation E-Mail Client 40 - the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105) variable. + the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105) variable. (Tip: try %?H?[%H] ? to display spam tags only when they are defined for a given message.) @@ -2196,13 +2196,13 @@ An example for testing for variable names can be used if users use different revisions of mutt-ng whereby the older one may not have a certain variable. To - test for the availability of _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 6.4.99 , page 103), + test for the availability of _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 6.4.98 , page 103), use: ifdef imap_mail_check 'set imap_mail_check = 300' Provided for completeness is the test for menu names. To set _$_p_a_g_e_r___i_n_d_e_x___l_i_n_e_s - (section 6.4.169 , page 122) only if the pager menu is available, use: + (section 6.4.168 , page 121) only if the pager menu is available, use: ifdef pager 'set pager_index_lines = 10' @@ -2756,7 +2756,7 @@ Mutt-ng supports connecting to external directory databases such as LDAP, ph/qi, bbdb, or NIS through a wrapper script which connects to mutt using a - simple interface. Using the _$_q_u_e_r_y___c_o_m_m_a_n_d (section 6.4.221 , page 134) vari- + simple interface. Using the _$_q_u_e_r_y___c_o_m_m_a_n_d (section 6.4.220 , page 133) vari- able, you specify the wrapper command to use. For example: set query_command = "mutt_ldap_query.pl '%s'" @@ -2798,7 +2798,7 @@ Mutt-ng supports reading and writing of four different mailbox formats: mbox, MMDF, MH and Maildir. The mailbox type is autodetected, so there is no need to use a flag for different mailbox types. When creating new mailboxes, Mutt-ng - uses the default specified with the _$_m_b_o_x___t_y_p_e (section 6.4.125 , page 111) + uses the default specified with the _$_m_b_o_x___t_y_p_e (section 6.4.124 , page 111) variable. mmbbooxx. This is the most widely used mailbox format for UNIX. All messages are @@ -2835,12 +2835,12 @@ These shortcuts can be used anywhere you are prompted for a file or mailbox path. - +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 6.4.295 , page 151) (incoming) + +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 6.4.294 , page 151) (incoming) mailbox - +o > -- refers to your _$_m_b_o_x (section 6.4.124 , page 111) file + +o > -- refers to your _$_m_b_o_x (section 6.4.123 , page 110) file - +o < -- refers to your _$_r_e_c_o_r_d (section 6.4.230 , page 136) file + +o < -- refers to your _$_r_e_c_o_r_d (section 6.4.229 , page 135) file +o ^ -- refers to the current mailbox @@ -2866,7 +2866,7 @@ the first of which is the ability to show the name of a list through which you received a message (i.e., of a subscribed list) in the _i_n_d_e_x menu display. This is useful to distinguish between personal and list mail in the same mail- - box. In the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105) variable, the escape + box. In the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105) variable, the escape ``%L'' will return the string ``To '' when ``list'' appears in the ``To'' The Mutt Next Generation E-Mail Client 58 @@ -2907,7 +2907,7 @@ the message. This can create problems when trying to reply directly to the author in private, since most mail clients will automatically reply to the address given in the ``Reply-To'' field. Mutt-ng uses the _$_r_e_p_l_y___t_o (section - 6.4.233 , page 136) variable to help decide which address to use. If set to + 6.4.232 , page 136) variable to help decide which address to use. If set to _a_s_k_-_y_e_s or _a_s_k_-_n_o, you will be prompted as to whether or not you would like to use the address given in the ``Reply-To'' field, or reply directly to the address given in the ``From'' field. When set to _y_e_s, the ``Reply-To'' field @@ -2915,13 +2915,13 @@ The ``X-Label:'' header field can be used to further identify mailing lists or list subject matter (or just to annotate messages individually). The - _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105) variable's ``%y'' and ``%Y'' + _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105) variable's ``%y'' and ``%Y'' escapes can be used to expand ``X-Label:'' fields in the index, and Mutt-ng's pattern-matcher can match regular expressions to ``X-Label:'' fields with the `` y'' selector. ``X-Label:'' is not a standard message header field, but it can easily be inserted by procmail and other mail filtering agents. - Lastly, Mutt-ng has the ability to _s_o_r_t (section 6.4.289 , page 149) the mail- + Lastly, Mutt-ng has the ability to _s_o_r_t (section 6.4.288 , page 149) the mail- box into _t_h_r_e_a_d_s (section 2.5.3 , page 11). A thread is a group of messages which all relate to the same subject. This is usually organized into a tree- like structure where a message and all of its replies are represented @@ -2993,7 +2993,7 @@ Polling for new mail is more expensive over POP3 than locally. For this reason the frequency at which Mutt-ng will check for mail remotely can be controlled - by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 6.4.208 , page 131) variable, which defaults + by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 6.4.207 , page 131) variable, which defaults to every 60 seconds. If Mutt-ng was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script with @@ -3003,8 +3003,8 @@ name@]popserver[:port]/. Another way to access your POP3 mail is the _f_e_t_c_h_-_m_a_i_l function (default: G). - It allows to connect to _p_o_p___h_o_s_t (section 6.4.206 , page 130), fetch all your - new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 6.4.295 , page 151). + It allows to connect to _p_o_p___h_o_s_t (section 6.4.205 , page 130), fetch all your + new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 6.4.294 , page 151). After this point, Mutt-ng runs exactly as if the mail had always been local. NNoottee:: If you only need to fetch all messages to local mailbox you should con- @@ -3047,11 +3047,11 @@ When browsing folders on an IMAP server, you can toggle whether to look at only the folders you are subscribed to, or all folders with the _t_o_g_g_l_e_-_s_u_b_s_c_r_i_b_e_d - command. See also the _$_i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d (section 6.4.97 , page 102) vari- + command. See also the _$_i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d (section 6.4.96 , page 102) vari- able. Polling for new mail on an IMAP server can cause noticeable delays. So, you'll - want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 6.4.99 , page 103) and + want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 6.4.98 , page 103) and _$_t_i_m_e_o_u_t (section 6.4.318 , page 158) variables. Note that if you are using mbox as the mail store on UW servers prior to @@ -3103,13 +3103,13 @@ There are a few variables which control authentication: - +o _$_i_m_a_p___u_s_e_r (section 6.4.105 , page 104) - controls the username under + +o _$_i_m_a_p___u_s_e_r (section 6.4.104 , page 104) - controls the username under which you request authentication on the IMAP server, for all authentica- tors. This is overridden by an explicit username in the mailbox path (i.e. by using a mailbox name of the form {user@host}). - +o _$_i_m_a_p___p_a_s_s (section 6.4.100 , page 103) - a password which you may pre- - set, used by all authentication methods where a password is needed. + +o _$_i_m_a_p___p_a_s_s (section 6.4.99 , page 103) - a password which you may preset, + used by all authentication methods where a password is needed. +o _$_i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s (section 6.4.91 , page 101) - a colon-delimited list of IMAP authentication methods to try, in the order you wish to try them. @@ -3124,7 +3124,7 @@ The Default newsserver can be obtained from the $NNTPSERVER environment vari- able. Like other news readers, info about subscribed newsgroups is saved in a - file as specified by the _$_n_n_t_p___n_e_w_s_r_c (section 6.4.156 , page 119) variable. + file as specified by the _$_n_n_t_p___n_e_w_s_r_c (section 6.4.155 , page 118) variable. Article headers are cached and can be loaded from a file when a newsgroup is entered instead loading from newsserver; currently, this caching mechanism still is different from the header caching for maildir/IMAP. @@ -3230,7 +3230,7 @@ compressed. This is important because it allows the use of programs that do not have well defined extensions. Just use '.' as a regexp. But this may be sur- prising if your compressing script produces empty files. In this situation, - unset _$_s_a_v_e___e_m_p_t_y (section 6.4.240 , page 138), so that the compressed file + unset _$_s_a_v_e___e_m_p_t_y (section 6.4.239 , page 138), so that the compressed file will be removed if you delete all of the messages. _4_._1_8_._1 _O_p_e_n _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x _f_o_r _r_e_a_d_i_n_g @@ -3307,7 +3307,7 @@ When _a_p_p_e_n_d_-_h_o_o_k (section 4.18.3 , page 65) is used, the folder is not opened, which saves time, but this means that we can not find out what the folder type - is. Thus the default (_$_m_b_o_x___t_y_p_e (section 6.4.125 , page 111)) type is always + is. Thus the default (_$_m_b_o_x___t_y_p_e (section 6.4.124 , page 111)) type is always supposed (i.e. this is the format used for the temporary folder). If the file does not exist when you save to it, _c_l_o_s_e_-_h_o_o_k (section 4.18.2 , @@ -3543,7 +3543,7 @@ The interpretation of shell meta-characters embedded in MIME parameters can lead to security problems in general. Mutt-ng tries to quote parameters in expansion of %s syntaxes properly, and avoids risky characters by substituting - them, see the _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 6.4.117 , page 109) variable. + them, see the _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 6.4.116 , page 109) variable. Although mutt's procedures to invoke programs with mailcap seem to be safe, there are other applications parsing mailcap, maybe taking less care of it. @@ -4304,7 +4304,7 @@ This is the string that will precede a message which has been included in a reply. For a full listing of defined printf(3)-like sequences see the section - on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105)''. + on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)''. _6_._4_._1_6 _a_u_t_o___t_a_g @@ -4517,8 +4517,8 @@ Default: yes This variable controls whether or not copies of your outgoing messages will be - saved for later references. Also see ``_$_r_e_c_o_r_d (section 6.4.230 , page - 136)'', ``_$_s_a_v_e___n_a_m_e (section 6.4.241 , page 138)'', ``_$_f_o_r_c_e___n_a_m_e (section + saved for later references. Also see ``_$_r_e_c_o_r_d (section 6.4.229 , page + 135)'', ``_$_s_a_v_e___n_a_m_e (section 6.4.240 , page 138)'', ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68 , page 96)'' and ``_f_c_c_-_h_o_o_k (section 3.18 , page 35)''. _6_._4_._3_4 _c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t @@ -4531,7 +4531,7 @@ going messages. This is probably only useful in connection to the _s_e_n_d_-_h_o_o_k command. It can be overridden by use of the _p_g_p_-_m_e_n_u, when encryption is not required or signing is requested as well. If ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section - 6.4.277 , page 147)'' is _s_e_t, then OpenSSL is used instead to create S/MIME + 6.4.276 , page 146)'' is _s_e_t, then OpenSSL is used instead to create S/MIME messages and settings can be overridden by use of the _s_m_i_m_e_-_m_e_n_u. (Crypto only) @@ -4545,7 +4545,7 @@ encryption/signing for messages. See also ``_$_c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t (section 6.4.34 , page 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38 , page 89)'', ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36 , page 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section - 6.4.39 , page 89)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277 , page 147)''. + 6.4.39 , page 89)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.276 , page 146)''. _6_._4_._3_6 _c_r_y_p_t___a_u_t_o_s_i_g_n @@ -4556,7 +4556,7 @@ Setting this variable will cause Mutt-ng to always attempt to cryptographically sign outgoing messages. This can be overridden by use of the _p_g_p_-_m_e_n_u, when signing is not required or encryption is requested as well. If - ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277 , page 147)'' is _s_e_t, then OpenSSL is + ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.276 , page 146)'' is _s_e_t, then OpenSSL is used instead to create S/MIME messages and settings can be overridden by use of the _s_m_i_m_e_-_m_e_n_u. (Crypto only) @@ -4572,7 +4572,7 @@ encryption/signing for messages. See also ``_$_c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t (section 6.4.34 , page 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38 , page 89)'', ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36 , page 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section - 6.4.39 , page 89)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277 , page 147)''. + 6.4.39 , page 89)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.276 , page 146)''. _6_._4_._3_8 _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t @@ -4651,12 +4651,12 @@ Default: '!%a, %b %d, %Y at %I:%M:%S%p %Z' This variable controls the format of the date printed by the ``%d'' sequence in - ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105)''. This is passed to strftime(3) + ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)''. This is passed to strftime(3) to process the date. Unless the first character in the string is a bang (``!''), the month and week day names are expanded according to the locale specified in the variable - ``_$_l_o_c_a_l_e (section 6.4.114 , page 108)''. If the first character in the string + ``_$_l_o_c_a_l_e (section 6.4.113 , page 108)''. If the first character in the string is a bang, the bang is discarded, and the month and week day names in the rest of the string are expanded in the _C locale (that is in US English). @@ -4826,7 +4826,7 @@ When _s_e_t, Mutt-ng will try to derive the message's _e_n_v_e_l_o_p_e sender from the ``From:'' header field. Note that this information is passed to the sendmail command using the ``-f' command line switch, so don't set this option if you - are using that switch in _$_s_e_n_d_m_a_i_l (section 6.4.247 , page 140) yourself, or + are using that switch in _$_s_e_n_d_m_a_i_l (section 6.4.246 , page 139) yourself, or if the sendmail on your machine doesn't support that command line switch. _6_._4_._5_9 _e_s_c_a_p_e @@ -4907,7 +4907,7 @@ Default: '%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f' This variable allows you to customize the file browser display to your personal - taste. This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page + taste. This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)'', but has its own set of printf(3)-like sequences: %C @@ -4980,8 +4980,8 @@ already known to have new mail. Also see the following variables: ``_$_t_i_m_e_o_u_t (section 6.4.318 , page 158)'', - ``_$_m_a_i_l___c_h_e_c_k (section 6.4.115 , page 109)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section - 6.4.99 , page 103)''. + ``_$_m_a_i_l___c_h_e_c_k (section 6.4.114 , page 108)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section + 6.4.98 , page 103)''. _6_._4_._6_8 _f_o_r_c_e___n_a_m_e @@ -4989,11 +4989,11 @@ Default: no - This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 6.4.241 , page 138)'', + This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 6.4.240 , page 138)'', except that Mutt-ng 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. - Also see the ``_$_r_e_c_o_r_d (section 6.4.230 , page 136)'' variable. + Also see the ``_$_r_e_c_o_r_d (section 6.4.229 , page 135)'' variable. _6_._4_._6_9 _f_o_r_w_a_r_d___d_e_c_o_d_e @@ -5003,8 +5003,8 @@ Controls the decoding of complex MIME messages into text/plain when forwarding a message. The message header is also RFC2047 decoded. This variable is only - used, if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.136 , page 113)'' is _u_n_s_e_t, otherwise - ``_$_m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.137 , page 113)'' is used instead. + used, if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.135 , page 112)'' is _u_n_s_e_t, otherwise + ``_$_m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.136 , page 113)'' is used instead. _6_._4_._7_0 _f_o_r_w_a_r_d___d_e_c_r_y_p_t @@ -5016,8 +5016,8 @@ Controls the handling of encrypted messages when forwarding a message. When _s_e_t, the outer layer of encryption is stripped off. This variable is only used - if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.136 , page 113)'' is _s_e_t and ``_$_m_i_m_e___f_o_r_- - _w_a_r_d___d_e_c_o_d_e (section 6.4.137 , page 113)'' is _u_n_s_e_t. (PGP only) + if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.135 , page 112)'' is _s_e_t and ``_$_m_i_m_e___f_o_r_- + _w_a_r_d___d_e_c_o_d_e (section 6.4.136 , page 113)'' is _u_n_s_e_t. (PGP only) _6_._4_._7_1 _f_o_r_w_a_r_d___e_d_i_t @@ -5036,7 +5036,7 @@ Default: '[%a: %s]' This variable controls the default subject when forwarding a message. It uses - the same format sequences as the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page + the same format sequences as the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)'' variable. _6_._4_._7_3 _f_o_r_w_a_r_d___q_u_o_t_e @@ -5046,8 +5046,8 @@ Default: no When _s_e_t forwarded messages included in the main body of the message (when - ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.136 , page 113)'' is _u_n_s_e_t) will be quoted using - ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109 , page 105)''. + ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.135 , page 112)'' is _u_n_s_e_t) will be quoted using + ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.108 , page 105)''. _6_._4_._7_4 _f_r_o_m @@ -5056,7 +5056,7 @@ Default: '' This variable contains a default from address. It can be overridden using - my_hdr (including from send-hooks) and ``_$_r_e_v_e_r_s_e___n_a_m_e (section 6.4.236 , page + my_hdr (including from send-hooks) and ``_$_r_e_v_e_r_s_e___n_a_m_e (section 6.4.235 , page 137)''. This variable is ignored if ``_$_u_s_e___f_r_o_m (section 6.4.327 , page 160)'' is unset. @@ -5294,18 +5294,7 @@ The Mutt Next Generation E-Mail Client 103 - _6_._4_._9_3 _i_m_a_p___f_o_r_c_e___s_s_l - - Type: boolean - - Default: no - - Availability: IMAP and SSL or IMAP and GNUTLS - - If this variable is _s_e_t, Mutt-ng will always use SSL when connecting to IMAP - servers. - - _6_._4_._9_4 _i_m_a_p___h_e_a_d_e_r_s + _6_._4_._9_3 _i_m_a_p___h_e_a_d_e_r_s Type: string @@ -5320,7 +5309,7 @@ NNoottee:: This is a space separated list. - _6_._4_._9_5 _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e + _6_._4_._9_4 _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e Type: string @@ -5332,7 +5321,7 @@ browser. If you see something else, you may set this variable to the IMAP path to your folders. - _6_._4_._9_6 _i_m_a_p___k_e_e_p_a_l_i_v_e + _6_._4_._9_5 _i_m_a_p___k_e_e_p_a_l_i_v_e Type: number @@ -5348,12 +5337,10 @@ utes) before a server is allowed to do this, but in practice the RFC does get violated every now and then. - The Mutt Next Generation E-Mail Client 104 - Reduce this number if you find yourself getting disconnected from your IMAP server due to inactivity. - _6_._4_._9_7 _i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d + _6_._4_._9_6 _i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d Type: boolean @@ -5361,11 +5348,13 @@ Availability: IMAP + The Mutt Next Generation E-Mail Client 104 + This variable configures whether IMAP folder browsing will look for only sub- scribed folders or all folders. This can be toggled in the IMAP browser with the _t_o_g_g_l_e_-_s_u_b_s_c_r_i_b_e_d function. - _6_._4_._9_8 _i_m_a_p___l_o_g_i_n + _6_._4_._9_7 _i_m_a_p___l_o_g_i_n Type: string @@ -5375,21 +5364,21 @@ Your login name on the IMAP server. - This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 6.4.105 , page + This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 6.4.104 , page 104).'' - _6_._4_._9_9 _i_m_a_p___m_a_i_l___c_h_e_c_k + _6_._4_._9_8 _i_m_a_p___m_a_i_l___c_h_e_c_k Type: number Default: 300 This variable configures how often (in seconds) Mutt-ng should look for new - mail in IMAP folders. This is split from the ``_m_a_i_l___c_h_e_c_k (section 6.4.115 , - page 109)'' variable to generate less traffic and get more accurate information + mail in IMAP folders. This is split from the ``_m_a_i_l___c_h_e_c_k (section 6.4.114 , + page 108)'' variable to generate less traffic and get more accurate information for local folders. - _6_._4_._1_0_0 _i_m_a_p___p_a_s_s + _6_._4_._9_9 _i_m_a_p___p_a_s_s Type: string @@ -5404,9 +5393,7 @@ machine, because the superuser can read your configuration even if you are the only one who can read the file. - The Mutt Next Generation E-Mail Client 105 - - _6_._4_._1_0_1 _i_m_a_p___p_a_s_s_i_v_e + _6_._4_._1_0_0 _i_m_a_p___p_a_s_s_i_v_e Type: boolean @@ -5416,10 +5403,13 @@ When _s_e_t, Mutt-ng will not open new IMAP connections to check for new mail. Mutt-ng will only check for new mail over existing IMAP connections. This is - useful if you don't want to be prompted to user/password pairs on Mutt-ng invo- - cation, or if opening the connection is slow. + useful if you don't want to be prompted to user/password pairs on Mutt-ng + + The Mutt Next Generation E-Mail Client 105 - _6_._4_._1_0_2 _i_m_a_p___p_e_e_k + invocation, or if opening the connection is slow. + + _6_._4_._1_0_1 _i_m_a_p___p_e_e_k Type: boolean @@ -5432,7 +5422,7 @@ closing an IMAP folder somewhat slower. This option exists to appease speed freaks. - _6_._4_._1_0_3 _i_m_a_p___r_e_c_o_n_n_e_c_t + _6_._4_._1_0_2 _i_m_a_p___r_e_c_o_n_n_e_c_t Type: quadoption @@ -5443,7 +5433,7 @@ Controls whether or not Mutt-ng will try to reconnect to IMAP server when the connection is lost. - _6_._4_._1_0_4 _i_m_a_p___s_e_r_v_e_r_n_o_i_s_e + _6_._4_._1_0_3 _i_m_a_p___s_e_r_v_e_r_n_o_i_s_e Type: boolean @@ -5456,12 +5446,10 @@ ration problems on the server which are out of the users' hands, you may wish to suppress them at some point. - _6_._4_._1_0_5 _i_m_a_p___u_s_e_r + _6_._4_._1_0_4 _i_m_a_p___u_s_e_r Type: string - The Mutt Next Generation E-Mail Client 106 - Default: '' Availability: IMAP @@ -5470,10 +5458,12 @@ This variable defaults to your user name on the local machine. - _6_._4_._1_0_6 _i_m_p_l_i_c_i_t___a_u_t_o_v_i_e_w + _6_._4_._1_0_5 _i_m_p_l_i_c_i_t___a_u_t_o_v_i_e_w Type: boolean + The Mutt Next Generation E-Mail Client 106 + Default: no If _s_e_t, Mutt-ng will look for a mailcap entry with the ``copiousoutput'' flag @@ -5481,7 +5471,7 @@ If such an entry is found, Mutt-ng will use the viewer defined in that entry to convert the body part to text form. - _6_._4_._1_0_7 _i_n_c_l_u_d_e + _6_._4_._1_0_6 _i_n_c_l_u_d_e Type: quadoption @@ -5490,7 +5480,7 @@ Controls whether or not a copy of the message(s) you are replying to is included in your reply. - _6_._4_._1_0_8 _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t + _6_._4_._1_0_7 _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t Type: boolean @@ -5499,7 +5489,7 @@ Controls whether or not Mutt-ng includes only the first attachment of the mes- sage you are replying. - _6_._4_._1_0_9 _i_n_d_e_n_t___s_t_r_i_n_g + _6_._4_._1_0_8 _i_n_d_e_n_t___s_t_r_i_n_g Type: string @@ -5509,17 +5499,14 @@ which you are replying. You are strongly encouraged not to change this value, as it tends to agitate the more fanatical netizens. - _6_._4_._1_1_0 _i_n_d_e_x___f_o_r_m_a_t + _6_._4_._1_0_9 _i_n_d_e_x___f_o_r_m_a_t Type: string Default: '%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s' - This variable allows you to customize the message index display to your - - The Mutt Next Generation E-Mail Client 107 - - personal taste. + This variable allows you to customize the message index display to your per- + sonal taste. ``Format strings'' are similar to the strings used in the ``C'' function printf(3) to format output (see the man page for more detail). The following @@ -5531,6 +5518,8 @@ %A reply-to address (if present; otherwise: address of author) + The Mutt Next Generation E-Mail Client 107 + %b filename of the original message folder (think mailBox) @@ -5573,8 +5562,6 @@ %i message-id of the current message - The Mutt Next Generation E-Mail Client 108 - %l number of lines in the message (does not work with maildir, mh, and possibly IMAP folders) @@ -5587,6 +5574,8 @@ %m total number of message in the mailbox + The Mutt Next Generation E-Mail Client 108 + %M number of hidden messages if the thread is collapsed. @@ -5628,11 +5617,8 @@ %Y `x-label' field, if present, and (1) not at part of a thread tree, - (2) at the top of a thread, or (3) `x-label' is different from - - The Mutt Next Generation E-Mail Client 109 - - preceding message's `x-label'. + (2) at the top of a thread, or (3) `x-label' is different from pre- + ceding message's `x-label'. %Z message status flags @@ -5644,6 +5630,9 @@ %[fmt] the date and time of the message is converted to the local time + + The Mutt Next Generation E-Mail Client 109 + zone, and ``fmt'' is expanded by the library function ``strftime''; a leading bang disables locales @@ -5664,7 +5653,7 @@ See also: ``_$_t_o___c_h_a_r_s (section 6.4.320 , page 158)''. - _6_._4_._1_1_1 _i_s_p_e_l_l + _6_._4_._1_1_0 _i_s_p_e_l_l Type: path @@ -5672,38 +5661,38 @@ How to invoke ispell (GNU's spell-checking software). - _6_._4_._1_1_2 _k_e_e_p___f_l_a_g_g_e_d + _6_._4_._1_1_1 _k_e_e_p___f_l_a_g_g_e_d Type: boolean Default: no If _s_e_t, read messages marked as flagged will not be moved from your spool mail- - box to your ``_$_m_b_o_x (section 6.4.124 , page 111)'' mailbox, or as a result of + box to your ``_$_m_b_o_x (section 6.4.123 , page 110)'' mailbox, or as a result of a ``_m_b_o_x_-_h_o_o_k (section 3.13 , page 33)'' command. - _6_._4_._1_1_3 _l_i_s_t___r_e_p_l_y + _6_._4_._1_1_2 _l_i_s_t___r_e_p_l_y Type: quadoption - The Mutt Next Generation E-Mail Client 110 - Default: no When _s_e_t, address replies to the mailing list the original message came from (instead to the author only). Setting this option to ``_a_s_k_-_y_e_s'' or ``_a_s_k_-_n_o'' will ask if you really intended to reply to the author only. - _6_._4_._1_1_4 _l_o_c_a_l_e + _6_._4_._1_1_3 _l_o_c_a_l_e Type: string Default: 'C' + The Mutt Next Generation E-Mail Client 110 + The locale used by strftime(3) to format dates. Legal values are the strings your system accepts for the locale variable LC_TIME. - _6_._4_._1_1_5 _m_a_i_l___c_h_e_c_k + _6_._4_._1_1_4 _m_a_i_l___c_h_e_c_k Type: number @@ -5713,9 +5702,9 @@ mail. NNoottee:: This does not apply to IMAP mailboxes, see _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section - 6.4.99 , page 103). + 6.4.98 , page 103). - _6_._4_._1_1_6 _m_a_i_l_c_a_p___p_a_t_h + _6_._4_._1_1_5 _m_a_i_l_c_a_p___p_a_t_h Type: string @@ -5724,7 +5713,7 @@ This variable specifies which files to consult when attempting to display MIME bodies not directly supported by Mutt-ng. - _6_._4_._1_1_7 _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e + _6_._4_._1_1_6 _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e Type: boolean @@ -5736,26 +5725,26 @@ DDOONN''TT CCHHAANNGGEE TTHHIISS SSEETTTTIINNGG UUNNLLEESSSS YYOOUU AARREE RREEAALLLLYY SSUURREE WWHHAATT YYOOUU AARREE DDOOIINNGG!! - _6_._4_._1_1_8 _m_a_i_l_d_i_r___h_e_a_d_e_r___c_a_c_h_e___v_e_r_i_f_y + _6_._4_._1_1_7 _m_a_i_l_d_i_r___h_e_a_d_e_r___c_a_c_h_e___v_e_r_i_f_y Type: boolean Default: yes - The Mutt Next Generation E-Mail Client 111 - Availability: Header Cache Check for Maildir unaware programs other than Mutt-ng having modified maildir files when the header cache is in use. This incurs one stat(2) per message every time the folder is opened. - _6_._4_._1_1_9 _m_a_i_l_d_i_r___t_r_a_s_h + _6_._4_._1_1_8 _m_a_i_l_d_i_r___t_r_a_s_h Type: boolean Default: no + The Mutt Next Generation E-Mail Client 111 + If _s_e_t, messages marked as deleted will be saved with the maildir (T)rashed flag instead of physically deleted. @@ -5764,7 +5753,7 @@ It is similiar to the trash option. - _6_._4_._1_2_0 _m_a_r_k___o_l_d + _6_._4_._1_1_9 _m_a_r_k___o_l_d Type: boolean @@ -5777,7 +5766,7 @@ up with an 'O' next to them in the ``index'' menu, indicating that they are old. - _6_._4_._1_2_1 _m_a_r_k_e_r_s + _6_._4_._1_2_0 _m_a_r_k_e_r_s Type: boolean @@ -5785,9 +5774,9 @@ Controls the display of wrapped lines in the internal pager. If set, a ``+'' marker is displayed at the beginning of wrapped lines. Also see the - ``_$_s_m_a_r_t___w_r_a_p (section 6.4.263 , page 144)'' variable. + ``_$_s_m_a_r_t___w_r_a_p (section 6.4.262 , page 143)'' variable. - _6_._4_._1_2_2 _m_a_s_k + _6_._4_._1_2_1 _m_a_s_k Type: regular expression @@ -5797,9 +5786,7 @@ operator ``!''. Only files whose names match this mask will be shown. The match is always case-sensitive. - The Mutt Next Generation E-Mail Client 112 - - _6_._4_._1_2_3 _m_a_x___l_i_n_e___l_e_n_g_t_h + _6_._4_._1_2_2 _m_a_x___l_i_n_e___l_e_n_g_t_h Type: number @@ -5810,16 +5797,18 @@ the maximum line length is determined by the terminal width and _$_w_r_a_p_m_a_r_g_i_n (section 6.4.335 , page 162). - _6_._4_._1_2_4 _m_b_o_x + _6_._4_._1_2_3 _m_b_o_x + + The Mutt Next Generation E-Mail Client 112 Type: path Default: '~/mbox' This specifies the folder into which read mail in your ``_$_s_p_o_o_l_f_i_l_e (section - 6.4.295 , page 151)'' folder will be appended. + 6.4.294 , page 151)'' folder will be appended. - _6_._4_._1_2_5 _m_b_o_x___t_y_p_e + _6_._4_._1_2_4 _m_b_o_x___t_y_p_e Type: folder magic @@ -5828,17 +5817,17 @@ The default mailbox type used when creating new folders. May be any of mbox, MMDF, MH and Maildir. - _6_._4_._1_2_6 _m_e_n_u___c_o_n_t_e_x_t + _6_._4_._1_2_5 _m_e_n_u___c_o_n_t_e_x_t Type: number Default: 0 This variable controls the number of lines of context that are given when - scrolling through menus. (Similar to ``_$_p_a_g_e_r___c_o_n_t_e_x_t (section 6.4.167 , page + scrolling through menus. (Similar to ``_$_p_a_g_e_r___c_o_n_t_e_x_t (section 6.4.166 , page 121)''.) - _6_._4_._1_2_7 _m_e_n_u___m_o_v_e___o_f_f + _6_._4_._1_2_6 _m_e_n_u___m_o_v_e___o_f_f Type: boolean @@ -5848,30 +5837,31 @@ the screen, unless there are less entries than lines. When _s_e_t, the bottom entry may move off the bottom. - _6_._4_._1_2_8 _m_e_n_u___s_c_r_o_l_l + _6_._4_._1_2_7 _m_e_n_u___s_c_r_o_l_l Type: boolean Default: no - The Mutt Next Generation E-Mail Client 113 - When _s_e_t, menus will be scrolled up or down one line when you attempt to move across a screen boundary. If _u_n_s_e_t, the screen is cleared and the next or pre- vious page of the menu is displayed (useful for slow links to avoid many redraws). - _6_._4_._1_2_9 _m_e_s_s_a_g_e___f_o_r_m_a_t + _6_._4_._1_2_8 _m_e_s_s_a_g_e___f_o_r_m_a_t Type: string Default: '%s' This is the string displayed in the ``attachment'' menu for attachments of type + + The Mutt Next Generation E-Mail Client 113 + message/rfc822. For a full listing of defined printf(3)-like sequences see the - section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105)''. + section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)''. - _6_._4_._1_3_0 _m_e_t_a___k_e_y + _6_._4_._1_2_9 _m_e_t_a___k_e_y Type: boolean @@ -5884,7 +5874,7 @@ because the result of removing the high bit from ``0xf4'' is ``0x74'', which is the ASCII character ``x''. - _6_._4_._1_3_1 _m_e_t_o_o + _6_._4_._1_3_0 _m_e_t_o_o Type: boolean @@ -5893,7 +5883,7 @@ If _u_n_s_e_t, Mutt-ng will remove your address (see the ``alternates'' command) from the list of recipients when replying to a message. - _6_._4_._1_3_2 _m_h___p_u_r_g_e + _6_._4_._1_3_1 _m_h___p_u_r_g_e Type: boolean @@ -5903,7 +5893,7 @@ _,_<_o_l_d _f_i_l_e _n_a_m_e_> in mh folders instead of really deleting them. If the vari- able is set, the message files will simply be deleted. - _6_._4_._1_3_3 _m_h___s_e_q___f_l_a_g_g_e_d + _6_._4_._1_3_2 _m_h___s_e_q___f_l_a_g_g_e_d Type: string @@ -5911,9 +5901,7 @@ The name of the MH sequence used for flagged messages. - The Mutt Next Generation E-Mail Client 114 - - _6_._4_._1_3_4 _m_h___s_e_q___r_e_p_l_i_e_d + _6_._4_._1_3_3 _m_h___s_e_q___r_e_p_l_i_e_d Type: string @@ -5921,15 +5909,17 @@ The name of the MH sequence used to tag replied messages. - _6_._4_._1_3_5 _m_h___s_e_q___u_n_s_e_e_n + _6_._4_._1_3_4 _m_h___s_e_q___u_n_s_e_e_n Type: string + The Mutt Next Generation E-Mail Client 114 + Default: 'unseen' The name of the MH sequence used for unseen messages. - _6_._4_._1_3_6 _m_i_m_e___f_o_r_w_a_r_d + _6_._4_._1_3_5 _m_i_m_e___f_o_r_w_a_r_d Type: quadoption @@ -5943,19 +5933,19 @@ not MIME from mail to mail, set this variable to ask-no or ask-yes. Also see ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.69 , page 96)'' and ``_$_m_i_m_e___f_o_r_- - _w_a_r_d___d_e_c_o_d_e (section 6.4.137 , page 113)''. + _w_a_r_d___d_e_c_o_d_e (section 6.4.136 , page 113)''. - _6_._4_._1_3_7 _m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e + _6_._4_._1_3_6 _m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e Type: boolean Default: no Controls the decoding of complex MIME messages into text/plain when forwarding - a message while ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.136 , page 113)'' is _s_e_t. Other- + a message while ``_$_m_i_m_e___f_o_r_w_a_r_d (section 6.4.135 , page 112)'' is _s_e_t. Other- wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.69 , page 96)'' is used instead. - _6_._4_._1_3_8 _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t + _6_._4_._1_3_7 _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t Type: quadoption @@ -5965,9 +5955,7 @@ menu, attachments which cannot be decoded in a reasonable manner will be attached to the newly composed message if this option is set. - _6_._4_._1_3_9 _m_i_x___e_n_t_r_y___f_o_r_m_a_t - - The Mutt Next Generation E-Mail Client 115 + _6_._4_._1_3_8 _m_i_x___e_n_t_r_y___f_o_r_m_a_t Type: string @@ -5981,6 +5969,8 @@ %n The running number on the menu. + The Mutt Next Generation E-Mail Client 115 + %c Remailer capabilities. @@ -5990,7 +5980,7 @@ %a The remailer's e-mail address. - _6_._4_._1_4_0 _m_i_x_m_a_s_t_e_r + _6_._4_._1_3_9 _m_i_x_m_a_s_t_e_r Type: path @@ -6002,17 +5992,17 @@ used with various sets of parameters to gather the list of known remailers, and to finally send a message through the mixmaster chain. - _6_._4_._1_4_1 _m_o_v_e + _6_._4_._1_4_0 _m_o_v_e Type: quadoption Default: ask-no Controls whether or not Mutt-ng will move read messages from your spool mailbox - to your ``_$_m_b_o_x (section 6.4.124 , page 111)'' mailbox, or as a result of a + to your ``_$_m_b_o_x (section 6.4.123 , page 110)'' mailbox, or as a result of a ``_m_b_o_x_-_h_o_o_k (section 3.13 , page 33)'' command. - _6_._4_._1_4_2 _m_s_g_i_d___f_o_r_m_a_t + _6_._4_._1_4_1 _m_s_g_i_d___f_o_r_m_a_t Type: string @@ -6023,8 +6013,6 @@ generated. The '%' character marks that certain data will be added to the string, similar to printf(3). The following characters are allowed: - The Mutt Next Generation E-Mail Client 116 - %d the current day of month @@ -6037,6 +6025,8 @@ %M the current minute + The Mutt Next Generation E-Mail Client 116 + %O the current UNIX timestamp (octal) @@ -6071,7 +6061,7 @@ NNoottee:: Please only change this setting if you know what you are doing. Also make sure to consult RFC2822 to produce technically _v_a_l_i_d strings. - _6_._4_._1_4_3 _n_a_r_r_o_w___t_r_e_e + _6_._4_._1_4_2 _n_a_r_r_o_w___t_r_e_e Type: boolean @@ -6080,9 +6070,7 @@ This variable, when _s_e_t, makes the thread tree narrower, allowing deeper threads to fit on the screen. - The Mutt Next Generation E-Mail Client 117 - - _6_._4_._1_4_4 _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o + _6_._4_._1_4_3 _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o Type: boolean @@ -6093,7 +6081,9 @@ If _s_e_t, Mutt-ng will prompt you for the Followup-To: header field before edit- ing the body of an outgoing news article. - _6_._4_._1_4_5 _n_n_t_p___a_s_k___x___c_o_m_m_e_n_t___t_o + The Mutt Next Generation E-Mail Client 117 + + _6_._4_._1_4_4 _n_n_t_p___a_s_k___x___c_o_m_m_e_n_t___t_o Type: boolean @@ -6104,7 +6094,7 @@ If _s_e_t, Mutt-ng will prompt you for the X-Comment-To: header field before edit- ing the body of an outgoing news article. - _6_._4_._1_4_6 _n_n_t_p___c_a_c_h_e___d_i_r + _6_._4_._1_4_5 _n_n_t_p___c_a_c_h_e___d_i_r Type: path @@ -6119,7 +6109,7 @@ As for the header caching in connection with IMAP and/or Maildir, this drasti- cally increases speed and lowers traffic. - _6_._4_._1_4_7 _n_n_t_p___c_a_t_c_h_u_p + _6_._4_._1_4_6 _n_n_t_p___c_a_t_c_h_u_p Type: quadoption @@ -6130,24 +6120,24 @@ If this variable is _s_e_t, Mutt-ng will mark all articles in a newsgroup as read when you leaving it. - _6_._4_._1_4_8 _n_n_t_p___c_o_n_t_e_x_t + _6_._4_._1_4_7 _n_n_t_p___c_o_n_t_e_x_t Type: number Default: 1000 - The Mutt Next Generation E-Mail Client 118 - Availability: NNTP This variable controls how many news articles to cache per newsgroup (if - caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 6.4.146 , page 116)) and how + caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 6.4.145 , page 116)) and how many news articles to show in the ``index'' menu. - If there're more articles than defined with _$_n_n_t_p___c_o_n_t_e_x_t (section 6.4.148 , + If there're more articles than defined with _$_n_n_t_p___c_o_n_t_e_x_t (section 6.4.147 , page 116), all older ones will be removed/not shown in the index. - _6_._4_._1_4_9 _n_n_t_p___f_o_l_l_o_w_u_p___t_o___p_o_s_t_e_r + _6_._4_._1_4_8 _n_n_t_p___f_o_l_l_o_w_u_p___t_o___p_o_s_t_e_r + + The Mutt Next Generation E-Mail Client 118 Type: quadoption @@ -6159,7 +6149,7 @@ header field, a follow-up to the newsgroup is not permitted. The message will be mailed to the submitter of the message via mail. - _6_._4_._1_5_0 _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t + _6_._4_._1_4_9 _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t Type: string @@ -6168,7 +6158,7 @@ Availability: NNTP This variable allows you to customize the newsgroup browser display to your - personal taste. This string is similar to ``_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , + personal taste. This string is similar to ``_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)'', but has its own set of printf(3)-like sequences: %C current newsgroup number @@ -6181,7 +6171,7 @@ %>X right justify the rest of the string and pad with character "X" %|X pad to the end of the line with character "X" - _6_._4_._1_5_1 _n_n_t_p___h_o_s_t + _6_._4_._1_5_0 _n_n_t_p___h_o_s_t Type: string @@ -6191,8 +6181,6 @@ This variable specifies the name (or address) of the NNTP server to be used. - The Mutt Next Generation E-Mail Client 119 - It defaults to the value specified via the environment variable $NNTPSERVER or contained in the file /etc/nntpserver. @@ -6203,9 +6191,12 @@ NNoottee:: 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 + + The Mutt Next Generation E-Mail Client 119 + file's permissions. - _6_._4_._1_5_2 _n_n_t_p___i_n_e_w_s + _6_._4_._1_5_1 _n_n_t_p___i_n_e_w_s Type: path @@ -6221,7 +6212,7 @@ Example: set inews='/usr/local/bin/inews -hS' - _6_._4_._1_5_3 _n_n_t_p___l_o_a_d___d_e_s_c_r_i_p_t_i_o_n + _6_._4_._1_5_2 _n_n_t_p___l_o_a_d___d_e_s_c_r_i_p_t_i_o_n Type: boolean @@ -6232,7 +6223,7 @@ This variable controls whether or not descriptions for newsgroups are to be loaded when subscribing to a newsgroup. - _6_._4_._1_5_4 _n_n_t_p___m_a_i_l___c_h_e_c_k + _6_._4_._1_5_3 _n_n_t_p___m_a_i_l___c_h_e_c_k Type: number @@ -6244,9 +6235,7 @@ article will cause a recheck for new news. If set to 0, Mutt-ng will recheck on each operation in index (stepping, read article, etc.). - The Mutt Next Generation E-Mail Client 120 - - _6_._4_._1_5_5 _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t + _6_._4_._1_5_4 _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t Type: boolean @@ -6257,9 +6246,11 @@ If _u_n_s_e_t, an 8-bit ``Subject:'' header field in a news article will not be encoded according to RFC2047. + The Mutt Next Generation E-Mail Client 120 + NNoottee:: Only change this setting if you know what you are doing. - _6_._4_._1_5_6 _n_n_t_p___n_e_w_s_r_c + _6_._4_._1_5_5 _n_n_t_p___n_e_w_s_r_c Type: path @@ -6275,7 +6266,7 @@ %s newsserver name - _6_._4_._1_5_7 _n_n_t_p___p_a_s_s + _6_._4_._1_5_6 _n_n_t_p___p_a_s_s Type: string @@ -6288,7 +6279,7 @@ NNoottee:: 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. - _6_._4_._1_5_8 _n_n_t_p___p_o_s_t___m_o_d_e_r_a_t_e_d + _6_._4_._1_5_7 _n_n_t_p___p_o_s_t___m_o_d_e_r_a_t_e_d Type: quadoption @@ -6299,12 +6290,10 @@ If set to _y_e_s, Mutt-ng will post articles to newsgroup that have not permis- sions to post (e.g. moderated). - The Mutt Next Generation E-Mail Client 121 - NNoottee:: if the newsserver does not support posting to that newsgroup or a group is totally read-only, that posting will not have any effect. - _6_._4_._1_5_9 _n_n_t_p___r_e_c_o_n_n_e_c_t + _6_._4_._1_5_8 _n_n_t_p___r_e_c_o_n_n_e_c_t Type: quadoption @@ -6312,10 +6301,12 @@ Availability: NNTP + The Mutt Next Generation E-Mail Client 121 + Controls whether or not Mutt-ng will try to reconnect to a newsserver when the was connection lost. - _6_._4_._1_6_0 _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d + _6_._4_._1_5_9 _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d Type: boolean @@ -6326,7 +6317,7 @@ When _s_e_t, info about unsubscribed newsgroups will be saved into the ``newsrc'' file and into the news cache. - _6_._4_._1_6_1 _n_n_t_p___s_h_o_w___n_e_w___n_e_w_s + _6_._4_._1_6_0 _n_n_t_p___s_h_o_w___n_e_w___n_e_w_s Type: boolean @@ -6339,7 +6330,7 @@ whether or not the number of new articles of subscribed newsgroups will be checked. - _6_._4_._1_6_2 _n_n_t_p___s_h_o_w___o_n_l_y___u_n_r_e_a_d + _6_._4_._1_6_1 _n_n_t_p___s_h_o_w___o_n_l_y___u_n_r_e_a_d Type: boolean @@ -6350,31 +6341,31 @@ If _s_e_t, only subscribed newsgroups that contain unread articles will be dis- played in the newsgroup browser. - _6_._4_._1_6_3 _n_n_t_p___u_s_e_r + _6_._4_._1_6_2 _n_n_t_p___u_s_e_r Type: string Default: '' - The Mutt Next Generation E-Mail Client 122 - Availability: NNTP Your login name on the NNTP server. If _u_n_s_e_t and the server requires authen- tification, Mutt-ng will prompt you for your account name. - _6_._4_._1_6_4 _n_n_t_p___x___c_o_m_m_e_n_t___t_o + _6_._4_._1_6_3 _n_n_t_p___x___c_o_m_m_e_n_t___t_o Type: boolean Default: no + The Mutt Next Generation E-Mail Client 122 + Availability: NNTP If _s_e_t, Mutt-ng will add a ``X-Comment-To:'' header field (that contains full name of the original article author) to articles that you followup to. - _6_._4_._1_6_5 _o_p_e_r_a_t_i_n_g___s_y_s_t_e_m + _6_._4_._1_6_4 _o_p_e_r_a_t_i_n_g___s_y_s_t_e_m Type: string @@ -6386,7 +6377,7 @@ It may, for example, look as: ``mutt-ng 1.5.9i (Linux)''. - _6_._4_._1_6_6 _p_a_g_e_r + _6_._4_._1_6_5 _p_a_g_e_r Type: path @@ -6401,7 +6392,7 @@ screen resizes cause lines longer than the screen width to be badly formatted in the help menu. - _6_._4_._1_6_7 _p_a_g_e_r___c_o_n_t_e_x_t + _6_._4_._1_6_6 _p_a_g_e_r___c_o_n_t_e_x_t Type: number @@ -6412,9 +6403,7 @@ will display the line after the last one on the screen at the top of the next page (0 lines of context). - The Mutt Next Generation E-Mail Client 123 - - _6_._4_._1_6_8 _p_a_g_e_r___f_o_r_m_a_t + _6_._4_._1_6_7 _p_a_g_e_r___f_o_r_m_a_t Type: string @@ -6422,10 +6411,12 @@ 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 ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105)'' + sequences are listed in the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)'' section. - _6_._4_._1_6_9 _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s + The Mutt Next Generation E-Mail Client 123 + + _6_._4_._1_6_8 _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s Type: number @@ -6442,7 +6433,7 @@ folder is less than _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s, then the index will only use as many lines as it needs. - _6_._4_._1_7_0 _p_a_g_e_r___s_t_o_p + _6_._4_._1_6_9 _p_a_g_e_r___s_t_o_p Type: boolean @@ -6451,7 +6442,7 @@ When _s_e_t, the internal-pager will nnoott move to the next message when you are at the end of a message and invoke the _n_e_x_t_-_p_a_g_e function. - _6_._4_._1_7_1 _p_g_p___a_u_t_o___d_e_c_o_d_e + _6_._4_._1_7_0 _p_g_p___a_u_t_o___d_e_c_o_d_e Type: boolean @@ -6464,12 +6455,10 @@ ditional-pgp function, Mutt-ng will automatically check the message for tradi- tional pgp. - _6_._4_._1_7_2 _p_g_p___a_u_t_o_i_n_l_i_n_e + _6_._4_._1_7_1 _p_g_p___a_u_t_o_i_n_l_i_n_e Type: boolean - The Mutt Next Generation E-Mail Client 124 - Default: no This option controls whether Mutt-ng generates old-style inline (traditional) @@ -6479,12 +6468,14 @@ Note that Mutt-ng might automatically use PGP/MIME for messages which consist of more than a single MIME part. Mutt-ng can be configured to ask before send- ing PGP/MIME messages when inline (traditional) would not work. See also: - ``_$_p_g_p___m_i_m_e___a_u_t_o (section 6.4.188 , page 126)''. + ``_$_p_g_p___m_i_m_e___a_u_t_o (section 6.4.187 , page 126)''. + + The Mutt Next Generation E-Mail Client 124 Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd. (PGP only) - _6_._4_._1_7_3 _p_g_p___c_h_e_c_k___e_x_i_t + _6_._4_._1_7_2 _p_g_p___c_h_e_c_k___e_x_i_t Type: boolean @@ -6493,7 +6484,7 @@ If _s_e_t, Mutt-ng 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) - _6_._4_._1_7_4 _p_g_p___c_l_e_a_r_s_i_g_n___c_o_m_m_a_n_d + _6_._4_._1_7_3 _p_g_p___c_l_e_a_r_s_i_g_n___c_o_m_m_a_n_d Type: string @@ -6503,7 +6494,7 @@ Note that the use of this format is ssttrroonnggllyy ddeepprreeccaatteedd. (PGP only) - _6_._4_._1_7_5 _p_g_p___d_e_c_o_d_e___c_o_m_m_a_n_d + _6_._4_._1_7_4 _p_g_p___d_e_c_o_d_e___c_o_m_m_a_n_d Type: string @@ -6525,10 +6516,8 @@ Expands to the name of a file containing the signature part of a multipart/signed attachment when verifying it. - The Mutt Next Generation E-Mail Client 125 - %a - The value of _$_p_g_p___s_i_g_n___a_s (section 6.4.192 , page 127). + The value of _$_p_g_p___s_i_g_n___a_s (section 6.4.191 , page 127). %r One or more key IDs. @@ -6538,7 +6527,9 @@ subdirectory which has been installed on your system alongside the documenta- tion. (PGP only) - _6_._4_._1_7_6 _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d + The Mutt Next Generation E-Mail Client 125 + + _6_._4_._1_7_5 _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d Type: string @@ -6546,7 +6537,7 @@ This command is used to decrypt a PGP encrypted message. (PGP only) - _6_._4_._1_7_7 _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d + _6_._4_._1_7_6 _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d Type: string @@ -6554,7 +6545,7 @@ This command is used to encrypt a body part without signing it. (PGP only) - _6_._4_._1_7_8 _p_g_p___e_n_c_r_y_p_t___s_i_g_n___c_o_m_m_a_n_d + _6_._4_._1_7_7 _p_g_p___e_n_c_r_y_p_t___s_i_g_n___c_o_m_m_a_n_d Type: string @@ -6562,14 +6553,14 @@ This command is used to both sign and encrypt a body part. (PGP only) - _6_._4_._1_7_9 _p_g_p___e_n_t_r_y___f_o_r_m_a_t + _6_._4_._1_7_8 _p_g_p___e_n_t_r_y___f_o_r_m_a_t Type: string Default: '%4n %t%f %4l/0x%k %-4a %2c %u' This variable allows you to customize the PGP key selection menu to your per- - sonal taste. This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page + sonal taste. This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)'', but has its own set of printf(3)-like sequences: %n @@ -6581,8 +6572,6 @@ %u user id - The Mutt Next Generation E-Mail Client 126 - %a algorithm @@ -6595,6 +6584,8 @@ %c capabilities + The Mutt Next Generation E-Mail Client 126 + %t trust/validity of the key-uid association @@ -6603,7 +6594,7 @@ (PGP only) - _6_._4_._1_8_0 _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d + _6_._4_._1_7_9 _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d Type: string @@ -6612,7 +6603,7 @@ This command is used to export a public key from the user's key ring. (PGP only) - _6_._4_._1_8_1 _p_g_p___g_e_t_k_e_y_s___c_o_m_m_a_n_d + _6_._4_._1_8_0 _p_g_p___g_e_t_k_e_y_s___c_o_m_m_a_n_d Type: string @@ -6621,39 +6612,40 @@ This command is invoked whenever Mutt-ng will need public key information. %r is the only printf(3)-like sequence used with this format. (PGP only) - _6_._4_._1_8_2 _p_g_p___g_o_o_d___s_i_g_n + _6_._4_._1_8_1 _p_g_p___g_o_o_d___s_i_g_n Type: regular expression Default: '' If you assign a text to this variable, then a PGP signature is only considered - verified if the output from _$_p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d (section 6.4.198 , page 129) + verified if the output from _$_p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d (section 6.4.197 , page 128) contains the text. Use this variable if the exit code from the command is 0 even for bad signatures. (PGP only) - _6_._4_._1_8_3 _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s + _6_._4_._1_8_2 _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s Type: boolean Default: yes - The Mutt Next Generation E-Mail Client 127 - Setting this variable will cause Mutt-ng to ignore OpenPGP subkeys. Instead, the principal key will inherit the subkeys' capabilities. _U_n_s_e_t this if you want to play interesting key selection games. (PGP only) - _6_._4_._1_8_4 _p_g_p___i_m_p_o_r_t___c_o_m_m_a_n_d + _6_._4_._1_8_3 _p_g_p___i_m_p_o_r_t___c_o_m_m_a_n_d Type: string Default: '' This command is used to import a key from a message into the user's public key + + The Mutt Next Generation E-Mail Client 127 + ring. (PGP only) - _6_._4_._1_8_5 _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d + _6_._4_._1_8_4 _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d Type: string @@ -6665,7 +6657,7 @@ This format is also generated by the pgpring utility which comes with Mutt-ng. (PGP only) - _6_._4_._1_8_6 _p_g_p___l_i_s_t___s_e_c_r_i_n_g___c_o_m_m_a_n_d + _6_._4_._1_8_5 _p_g_p___l_i_s_t___s_e_c_r_i_n_g___c_o_m_m_a_n_d Type: string @@ -6677,7 +6669,7 @@ This format is also generated by the pgpring utility which comes with Mutt-ng. (PGP only) - _6_._4_._1_8_7 _p_g_p___l_o_n_g___i_d_s + _6_._4_._1_8_6 _p_g_p___l_o_n_g___i_d_s Type: boolean @@ -6686,7 +6678,7 @@ If _s_e_t, use 64 bit PGP key IDs. _U_n_s_e_t uses the normal 32 bit Key IDs. (PGP only) - _6_._4_._1_8_8 _p_g_p___m_i_m_e___a_u_t_o + _6_._4_._1_8_7 _p_g_p___m_i_m_e___a_u_t_o Type: quadoption @@ -6694,20 +6686,19 @@ This option controls whether Mutt-ng will prompt you for automatically sending a (signed/encrypted) message using PGP/MIME when inline (traditional) fails - - The Mutt Next Generation E-Mail Client 128 - (for any reason). Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd. (PGP only) - _6_._4_._1_8_9 _p_g_p___r_e_p_l_y_i_n_l_i_n_e + _6_._4_._1_8_8 _p_g_p___r_e_p_l_y_i_n_l_i_n_e Type: boolean Default: no + The Mutt Next Generation E-Mail Client 128 + Setting this variable will cause Mutt-ng 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 _p_g_p_-_m_e_n_u, when inline is not @@ -6718,12 +6709,12 @@ Note that Mutt-ng might automatically use PGP/MIME for messages which consist of more than a single MIME part. Mutt-ng can be configured to ask before send- ing PGP/MIME messages when inline (traditional) would not work. See also: - ``_$_p_g_p___m_i_m_e___a_u_t_o (section 6.4.188 , page 126)''. + ``_$_p_g_p___m_i_m_e___a_u_t_o (section 6.4.187 , page 126)''. Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd. (PGP only) - _6_._4_._1_9_0 _p_g_p___r_e_t_a_i_n_a_b_l_e___s_i_g_s + _6_._4_._1_8_9 _p_g_p___r_e_t_a_i_n_a_b_l_e___s_i_g_s Type: boolean @@ -6736,7 +6727,7 @@ the outer layer (multipart/encrypted) can be easily removed, while the inner multipart/signed part is retained. (PGP only) - _6_._4_._1_9_1 _p_g_p___s_h_o_w___u_n_u_s_a_b_l_e + _6_._4_._1_9_0 _p_g_p___s_h_o_w___u_n_u_s_a_b_l_e Type: boolean @@ -6746,28 +6737,28 @@ This includes keys which have been revoked, have expired, or have been marked as ``disabled'' by the user. (PGP only) - _6_._4_._1_9_2 _p_g_p___s_i_g_n___a_s + _6_._4_._1_9_1 _p_g_p___s_i_g_n___a_s Type: string Default: '' - The Mutt Next Generation E-Mail Client 129 - If you have more than one key pair, this option allows you to specify which of your private keys to use. It is recommended that you use the keyid form to specify your key (e.g., ``0x00112233''). (PGP only) - _6_._4_._1_9_3 _p_g_p___s_i_g_n___c_o_m_m_a_n_d + _6_._4_._1_9_2 _p_g_p___s_i_g_n___c_o_m_m_a_n_d Type: string Default: '' + The Mutt Next Generation E-Mail Client 129 + This command is used to create the detached PGP signature for a multi- part/signed PGP/MIME body part. (PGP only) - _6_._4_._1_9_4 _p_g_p___s_o_r_t___k_e_y_s + _6_._4_._1_9_3 _p_g_p___s_o_r_t___k_e_y_s Type: sort order @@ -6791,7 +6782,7 @@ If you prefer reverse order of the above values, prefix it with ``reverse-''. (PGP only) - _6_._4_._1_9_5 _p_g_p___s_t_r_i_c_t___e_n_c + _6_._4_._1_9_4 _p_g_p___s_t_r_i_c_t___e_n_c Type: boolean @@ -6802,18 +6793,16 @@ non-verifyable PGP signatures, so only change this if you know what you are doing. (PGP only) - _6_._4_._1_9_6 _p_g_p___t_i_m_e_o_u_t + _6_._4_._1_9_5 _p_g_p___t_i_m_e_o_u_t Type: number Default: 300 - The Mutt Next Generation E-Mail Client 130 - The number of seconds after which a cached passphrase will expire if not used. Default: 300. (PGP only) - _6_._4_._1_9_7 _p_g_p___u_s_e___g_p_g___a_g_e_n_t + _6_._4_._1_9_6 _p_g_p___u_s_e___g_p_g___a_g_e_n_t Type: boolean @@ -6821,7 +6810,9 @@ If _s_e_t, Mutt-ng will use a possibly-running gpg-agent process. (PGP only) - _6_._4_._1_9_8 _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d + The Mutt Next Generation E-Mail Client 130 + + _6_._4_._1_9_7 _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d Type: string @@ -6829,7 +6820,7 @@ This command is used to verify PGP signatures. (PGP only) - _6_._4_._1_9_9 _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d + _6_._4_._1_9_8 _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d Type: string @@ -6838,7 +6829,7 @@ This command is used to verify key information from the key selection menu. (PGP only) - _6_._4_._2_0_0 _p_i_p_e___d_e_c_o_d_e + _6_._4_._1_9_9 _p_i_p_e___d_e_c_o_d_e Type: boolean @@ -6848,7 +6839,7 @@ pipe the messages without any preprocessing. When _s_e_t, Mutt-ng will weed head- ers and will attempt to PGP/MIME decode the messages first. - _6_._4_._2_0_1 _p_i_p_e___s_e_p + _6_._4_._2_0_0 _p_i_p_e___s_e_p Type: string @@ -6857,28 +6848,27 @@ The separator to add between messages when piping a list of tagged messages to an external Unix command. - _6_._4_._2_0_2 _p_i_p_e___s_p_l_i_t + _6_._4_._2_0_1 _p_i_p_e___s_p_l_i_t Type: boolean Default: no Used in connection with the _p_i_p_e_-_m_e_s_s_a_g_e command and the ``tag- prefix'' or - - The Mutt Next Generation E-Mail Client 131 - ``tag-prefix-cond'' operators. If this variable is _u_n_s_e_t, when piping a list of tagged messages Mutt-ng will concatenate the messages and will pipe them as a single folder. When _s_e_t, Mutt-ng will pipe the messages one by one. In both cases the messages are piped in the current sorted order, and the ``_$_p_i_p_e___s_e_p - (section 6.4.201 , page 129)'' separator is added after each message. + (section 6.4.200 , page 129)'' separator is added after each message. - _6_._4_._2_0_3 _p_o_p___a_u_t_h___t_r_y___a_l_l + _6_._4_._2_0_2 _p_o_p___a_u_t_h___t_r_y___a_l_l Type: boolean Default: yes + The Mutt Next Generation E-Mail Client 131 + Availability: POP If _s_e_t, Mutt-ng will try all available methods. When _u_n_s_e_t, Mutt-ng will only @@ -6886,7 +6876,7 @@ able. If a method is available but authentication fails, Mutt-ng will not con- nect to the POP server. - _6_._4_._2_0_4 _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s + _6_._4_._2_0_3 _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s Type: string @@ -6905,7 +6895,7 @@ Example: set pop_authenticators='digest-md5:apop:user' - _6_._4_._2_0_5 _p_o_p___d_e_l_e_t_e + _6_._4_._2_0_4 _p_o_p___d_e_l_e_t_e Type: quadoption @@ -6917,12 +6907,10 @@ server when using the ``fetch-mail'' function. When _u_n_s_e_t, Mutt-ng will down- load messages but also leave them on the POP server. - _6_._4_._2_0_6 _p_o_p___h_o_s_t + _6_._4_._2_0_5 _p_o_p___h_o_s_t Type: string - The Mutt Next Generation E-Mail Client 132 - Default: '' Availability: POP @@ -6935,7 +6923,9 @@ NNoottee:: 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. - _6_._4_._2_0_7 _p_o_p___l_a_s_t + The Mutt Next Generation E-Mail Client 132 + + _6_._4_._2_0_6 _p_o_p___l_a_s_t Type: boolean @@ -6947,7 +6937,7 @@ retrieving only unread messages from the POP server when using the ``fetch- mail'' function. - _6_._4_._2_0_8 _p_o_p___m_a_i_l___c_h_e_c_k + _6_._4_._2_0_7 _p_o_p___m_a_i_l___c_h_e_c_k Type: number @@ -6957,7 +6947,7 @@ This variable configures how often (in seconds) POP should look for new mail. - _6_._4_._2_0_9 _p_o_p___p_a_s_s + _6_._4_._2_0_8 _p_o_p___p_a_s_s Type: string @@ -6971,20 +6961,18 @@ NNoottee:: 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. - _6_._4_._2_1_0 _p_o_p___r_e_c_o_n_n_e_c_t + _6_._4_._2_0_9 _p_o_p___r_e_c_o_n_n_e_c_t Type: quadoption Default: ask-yes - The Mutt Next Generation E-Mail Client 133 - Availability: POP Controls whether or not Mutt-ng will try to reconnect to a POP server when the connection is lost. - _6_._4_._2_1_1 _p_o_p___u_s_e_r + _6_._4_._2_1_0 _p_o_p___u_s_e_r Type: string @@ -6992,11 +6980,13 @@ Availability: POP + The Mutt Next Generation E-Mail Client 133 + Your login name on the POP server. This variable defaults to your user name on the local machine. - _6_._4_._2_1_2 _p_o_s_t___i_n_d_e_n_t___s_t_r_i_n_g + _6_._4_._2_1_1 _p_o_s_t___i_n_d_e_n_t___s_t_r_i_n_g Type: string @@ -7006,39 +6996,36 @@ will append this string after the inclusion of a message which is being replied to. - _6_._4_._2_1_3 _p_o_s_t_p_o_n_e + _6_._4_._2_1_2 _p_o_s_t_p_o_n_e Type: quadoption Default: ask-yes Controls whether or not messages are saved in the ``_$_p_o_s_t_p_o_n_e_d (section - 6.4.214 , page 132)'' mailbox when you elect not to send immediately. + 6.4.213 , page 132)'' mailbox when you elect not to send immediately. - _6_._4_._2_1_4 _p_o_s_t_p_o_n_e_d + _6_._4_._2_1_3 _p_o_s_t_p_o_n_e_d Type: path Default: '~/postponed' - Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 6.4.213 , page 132) + Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 6.4.212 , page 132) sending a message'' which you are editing. When you choose to postpone a mes- sage, Mutt-ng saves it in the mailbox specified by this variable. Also see the - ``_$_p_o_s_t_p_o_n_e (section 6.4.213 , page 132)'' variable. + ``_$_p_o_s_t_p_o_n_e (section 6.4.212 , page 132)'' variable. - _6_._4_._2_1_5 _p_r_e_c_o_n_n_e_c_t + _6_._4_._2_1_4 _p_r_e_c_o_n_n_e_c_t Type: string Default: '' - If _s_e_t, a shell command to be executed if Mutt-ng fails to establish a - - The Mutt Next Generation E-Mail Client 134 - - connection to the server. This is useful for setting up secure connections, - e.g. with ssh(1). If the command returns a nonzero status, Mutt-ng gives up - opening the server. Example: + If _s_e_t, a shell command to be executed if Mutt-ng fails to establish a connec- + tion to the server. This is useful for setting up secure connections, e.g. with + ssh(1). If the command returns a nonzero status, Mutt-ng gives up opening the + server. Example: preconnect='ssh -f -q -L 1234:mailhost.net:143 mailhost.net sleep 20 < /dev/null > /dev/null' @@ -7048,7 +7035,9 @@ NNoottee:: For this example to work, you must be able to log in to the remote machine without having to enter a password. - _6_._4_._2_1_6 _p_r_i_n_t + The Mutt Next Generation E-Mail Client 134 + + _6_._4_._2_1_5 _p_r_i_n_t Type: quadoption @@ -7057,7 +7046,7 @@ Controls whether or not Mutt-ng really prints messages. This is set to _a_s_k_-_n_o by default, because some people accidentally hit ``p'' often. - _6_._4_._2_1_7 _p_r_i_n_t___c_o_m_m_a_n_d + _6_._4_._2_1_6 _p_r_i_n_t___c_o_m_m_a_n_d Type: path @@ -7065,7 +7054,7 @@ This specifies the command pipe that should be used to print messages. - _6_._4_._2_1_8 _p_r_i_n_t___d_e_c_o_d_e + _6_._4_._2_1_7 _p_r_i_n_t___d_e_c_o_d_e Type: boolean @@ -7073,41 +7062,42 @@ Used in connection with the print-message command. If this option is _s_e_t, the message is decoded before it is passed to the external command specified by - _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.217 , page 133). If this option is _u_n_s_e_t, no pro- + _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.216 , page 133). If this option is _u_n_s_e_t, no pro- cessing will be applied to the message when printing it. The latter setting may be useful if you are using some advanced printer filter which is able to properly format e-mail messages for printing. - _6_._4_._2_1_9 _p_r_i_n_t___s_p_l_i_t + _6_._4_._2_1_8 _p_r_i_n_t___s_p_l_i_t Type: boolean Default: no Used in connection with the print-message command. If this option is _s_e_t, the - command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.217 , page 133) is executed + command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.216 , page 133) is executed once for each message which is to be printed. If this option is _u_n_s_e_t, the - command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.217 , page 133) is executed + command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.216 , page 133) is executed only once, and all the messages are concatenated, with a form feed as the mes- sage separator. - The Mutt Next Generation E-Mail Client 135 - Those who use the enscript(1) program's mail-printing mode will most likely want to set this option. - _6_._4_._2_2_0 _p_r_o_m_p_t___a_f_t_e_r + _6_._4_._2_1_9 _p_r_o_m_p_t___a_f_t_e_r Type: boolean Default: yes - If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 6.4.166 , page 121)'', setting this + If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 6.4.165 , page 121)'', setting this variable will cause Mutt-ng to prompt you for a command when the pager exits + + The Mutt Next Generation E-Mail Client 135 + rather than returning to the index menu. If _u_n_s_e_t, Mutt-ng will return to the index menu when the external pager exits. - _6_._4_._2_2_1 _q_u_e_r_y___c_o_m_m_a_n_d + _6_._4_._2_2_0 _q_u_e_r_y___c_o_m_m_a_n_d Type: path @@ -7118,7 +7108,7 @@ query string the user types. See ``_q_u_e_r_y (section 4.7 , page 55)'' for more information. - _6_._4_._2_2_2 _q_u_i_t + _6_._4_._2_2_1 _q_u_i_t Type: quadoption @@ -7129,16 +7119,16 @@ and if it is set to _a_s_k_-_y_e_s or _a_s_k_-_n_o, you are prompted for confirmation when you try to quit. - _6_._4_._2_2_3 _q_u_o_t_e___e_m_p_t_y + _6_._4_._2_2_2 _q_u_o_t_e___e_m_p_t_y Type: boolean Default: yes Controls whether or not empty lines will be quoted using ``_i_n_d_e_n_t___s_t_r_i_n_g (sec- - tion 6.4.109 , page 105)''. + tion 6.4.108 , page 105)''. - _6_._4_._2_2_4 _q_u_o_t_e___q_u_o_t_e_d + _6_._4_._2_2_3 _q_u_o_t_e___q_u_o_t_e_d Type: boolean @@ -7146,11 +7136,9 @@ Controls how quoted lines will be quoted. If _s_e_t, one quote character will be added to the end of existing prefix. Otherwise, quoted lines will be prepended - by ``_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109 , page 105)''. + by ``_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.108 , page 105)''. - The Mutt Next Generation E-Mail Client 136 - - _6_._4_._2_2_5 _q_u_o_t_e___r_e_g_e_x_p + _6_._4_._2_2_4 _q_u_o_t_e___r_e_g_e_x_p Type: regular expression @@ -7160,10 +7148,13 @@ text in the body of a message. NNoottee:: In order to use the _q_u_o_t_e_dxx patterns in the internal pager, you need to + + The Mutt Next Generation E-Mail Client 136 + set this to a regular expression that matches _e_x_a_c_t_l_y the quote characters at the beginning of quoted lines. - _6_._4_._2_2_6 _r_e_a_d___i_n_c + _6_._4_._2_2_5 _r_e_a_d___i_n_c Type: number @@ -7179,7 +7170,7 @@ Also see the ``_$_w_r_i_t_e___i_n_c (section 6.4.337 , page 162)'' variable. - _6_._4_._2_2_7 _r_e_a_d___o_n_l_y + _6_._4_._2_2_6 _r_e_a_d___o_n_l_y Type: boolean @@ -7187,7 +7178,7 @@ If set, all folders are opened in read-only mode. - _6_._4_._2_2_8 _r_e_a_l_n_a_m_e + _6_._4_._2_2_7 _r_e_a_l_n_a_m_e Type: string @@ -7201,20 +7192,20 @@ _N_o_t_e_: This variable will _n_o_t be used when the user has set a real name in the _$_f_r_o_m (section 6.4.74 , page 97) variable. - _6_._4_._2_2_9 _r_e_c_a_l_l + _6_._4_._2_2_8 _r_e_c_a_l_l Type: quadoption - The Mutt Next Generation E-Mail Client 137 - Default: ask-yes Controls whether or not Mutt-ng recalls postponed messages when composing a new - message. Also see ``_$_p_o_s_t_p_o_n_e_d (section 6.4.214 , page 132)''. + message. Also see ``_$_p_o_s_t_p_o_n_e_d (section 6.4.213 , page 132)''. Setting this variable to _y_e_s is not generally useful, and thus not recommended. - _6_._4_._2_3_0 _r_e_c_o_r_d + _6_._4_._2_2_9 _r_e_c_o_r_d + + The Mutt Next Generation E-Mail Client 137 Type: path @@ -7225,12 +7216,12 @@ another way to do this is using the ``_m_y___h_d_r (section 3.15 , page 34)'' com- mand to create a Bcc: header field with your email address in it.) - The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _6_._4_._2_3_0 _, _p_a_g_e _1_3_6_) is overridden by the + The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _6_._4_._2_2_9 _, _p_a_g_e _1_3_5_) is overridden by the ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68 , page 96)'' and ``_$_s_a_v_e___n_a_m_e (section - 6.4.241 , page 138)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18 , page + 6.4.240 , page 138)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18 , page 35)'' command. - _6_._4_._2_3_1 _r_e_p_l_y___r_e_g_e_x_p + _6_._4_._2_3_0 _r_e_p_l_y___r_e_g_e_x_p Type: regular expression @@ -7240,7 +7231,7 @@ ing. The default value corresponds to the English ``Re:'' and the German ``Aw:''. - _6_._4_._2_3_2 _r_e_p_l_y___s_e_l_f + _6_._4_._2_3_1 _r_e_p_l_y___s_e_l_f Type: boolean @@ -7250,7 +7241,7 @@ that you want to reply to the recipients of that message rather than to your- self. - _6_._4_._2_3_3 _r_e_p_l_y___t_o + _6_._4_._2_3_2 _r_e_p_l_y___t_o Type: quadoption @@ -7261,23 +7252,22 @@ use the address in the ``From:'' header field instead. This option is useful for reading a mailing list that sets the ``Reply-To:'' - - The Mutt Next Generation E-Mail Client 138 - header field to the list address and you want to send a private message to the author of a message. - _6_._4_._2_3_4 _r_e_s_o_l_v_e + _6_._4_._2_3_3 _r_e_s_o_l_v_e Type: boolean Default: yes + The Mutt Next Generation E-Mail Client 138 + When set, the cursor will be automatically advanced to the next (possibly undeleted) message whenever a command that modifies the current message is exe- cuted. - _6_._4_._2_3_5 _r_e_v_e_r_s_e___a_l_i_a_s + _6_._4_._2_3_4 _r_e_v_e_r_s_e___a_l_i_a_s Type: boolean @@ -7297,7 +7287,7 @@ ``abd30425@somewhere.net.'' This is useful when the person's e-mail address is not human friendly (like CompuServe addresses). - _6_._4_._2_3_6 _r_e_v_e_r_s_e___n_a_m_e + _6_._4_._2_3_5 _r_e_v_e_r_s_e___n_a_m_e Type: boolean @@ -7311,25 +7301,24 @@ would be used doesn't match your alternates, the From: line will use your address on the current machine. - _6_._4_._2_3_7 _r_e_v_e_r_s_e___r_e_a_l_n_a_m_e + _6_._4_._2_3_6 _r_e_v_e_r_s_e___r_e_a_l_n_a_m_e Type: boolean Default: yes - This variable fine-tunes the behaviour of the _r_e_v_e_r_s_e___n_a_m_e (section 6.4.236 , - - The Mutt Next Generation E-Mail Client 139 - + This variable fine-tunes the behaviour of the _r_e_v_e_r_s_e___n_a_m_e (section 6.4.235 , page 137) feature. When it is _s_e_t, Mutt-ng will use the address from incoming messages as-is, possibly including eventual real names. When it is _u_n_s_e_t, Mutt-ng will override any such real names with the setting of the _r_e_a_l_n_a_m_e - (section 6.4.228 , page 135) variable. + (section 6.4.227 , page 135) variable. - _6_._4_._2_3_8 _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s + _6_._4_._2_3_7 _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s Type: boolean + The Mutt Next Generation E-Mail Client 139 + Default: no When this variable is _s_e_t, Mutt-ng will decode RFC-2047-encoded MIME parame- @@ -7348,36 +7337,34 @@ _g_e_n_e_r_a_t_e_s this kind of encoding. Instead, Mutt-ng will unconditionally use the encoding specified in RFC 2231. - _6_._4_._2_3_9 _s_a_v_e___a_d_d_r_e_s_s + _6_._4_._2_3_8 _s_a_v_e___a_d_d_r_e_s_s Type: boolean Default: no If _s_e_t, Mutt-ng will take the sender's full address when choosing a default - folder for saving a mail. If ``_$_s_a_v_e___n_a_m_e (section 6.4.241 , page 138)'' or + folder for saving a mail. If ``_$_s_a_v_e___n_a_m_e (section 6.4.240 , page 138)'' or ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68 , page 96)'' is _s_e_t too, the selection of the fcc folder will be changed as well. - _6_._4_._2_4_0 _s_a_v_e___e_m_p_t_y + _6_._4_._2_3_9 _s_a_v_e___e_m_p_t_y Type: boolean Default: yes When _u_n_s_e_t, mailboxes which contain no saved messages will be removed when - closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 6.4.295 , page 151)'' which is + closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 6.4.294 , page 151)'' which is never removed). If _s_e_t, mailboxes are never removed. NNoottee:: This only applies to mbox and MMDF folders, Mutt-ng does not delete MH and Maildir directories. - _6_._4_._2_4_1 _s_a_v_e___n_a_m_e + _6_._4_._2_4_0 _s_a_v_e___n_a_m_e Type: boolean - The Mutt Next Generation E-Mail Client 140 - Default: no This variable controls how copies of outgoing messages are saved. When set, a @@ -7385,11 +7372,13 @@ (this is done by searching for a mailbox in the ``_$_f_o_l_d_e_r (section 6.4.64 , page 94)'' directory with the _u_s_e_r_n_a_m_e 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 ``_$_r_e_c_o_r_d (section 6.4.230 , page 136)'' mailbox. + the message is saved to the ``_$_r_e_c_o_r_d (section 6.4.229 , page 135)'' mailbox. + + The Mutt Next Generation E-Mail Client 140 Also see the ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68 , page 96)'' variable. - _6_._4_._2_4_2 _s_c_o_r_e + _6_._4_._2_4_1 _s_c_o_r_e Type: boolean @@ -7397,9 +7386,9 @@ When this variable is _u_n_s_e_t, scoring is turned off. This can be useful to selectively disable scoring for certain folders when the ``_$_s_c_o_r_e___t_h_r_e_s_h_- - _o_l_d___d_e_l_e_t_e (section 6.4.243 , page 139)'' variable and friends are used. + _o_l_d___d_e_l_e_t_e (section 6.4.242 , page 139)'' variable and friends are used. - _6_._4_._2_4_3 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e + _6_._4_._2_4_2 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e Type: number @@ -7410,7 +7399,7 @@ scores are always greater than or equal to zero, the default setting of this variable will never mark a message for deletion. - _6_._4_._2_4_4 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g + _6_._4_._2_4_3 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g Type: number @@ -7419,7 +7408,7 @@ Messages which have been assigned a score greater than or equal to this vari- able's value are automatically marked ``flagged''. - _6_._4_._2_4_5 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d + _6_._4_._2_4_4 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d Type: number @@ -7430,9 +7419,7 @@ scores are always greater than or equal to zero, the default setting of this variable will never mark a message read. - _6_._4_._2_4_6 _s_e_n_d___c_h_a_r_s_e_t - - The Mutt Next Generation E-Mail Client 141 + _6_._4_._2_4_5 _s_e_n_d___c_h_a_r_s_e_t Type: string @@ -7443,9 +7430,12 @@ (section 6.4.24 , page 86)'' is not iso-8859-1 and recipients may not under- stand UTF-8, it is advisable to include in the list an appropriate widely used standard character set (such as iso-8859-2, koi8-r or iso-2022-jp) either + + The Mutt Next Generation E-Mail Client 141 + instead of or after iso-8859-1. - _6_._4_._2_4_7 _s_e_n_d_m_a_i_l + _6_._4_._2_4_6 _s_e_n_d_m_a_i_l Type: path @@ -7455,14 +7445,14 @@ Mutt-ng expects that the specified program interprets additional arguments as recipient addresses. - _6_._4_._2_4_8 _s_e_n_d_m_a_i_l___w_a_i_t + _6_._4_._2_4_7 _s_e_n_d_m_a_i_l___w_a_i_t Type: number Default: 0 - Specifies the number of seconds to wait for the ``_$_s_e_n_d_m_a_i_l (section 6.4.247 , - page 140)'' process to finish before giving up and putting delivery in the + Specifies the number of seconds to wait for the ``_$_s_e_n_d_m_a_i_l (section 6.4.246 , + page 139)'' process to finish before giving up and putting delivery in the background. Mutt-ng interprets the value of this variable as follows: @@ -7480,7 +7470,7 @@ will be put in a temporary file. If there is some error, you will be informed as to where to find the output. - _6_._4_._2_4_9 _s_h_e_l_l + _6_._4_._2_4_8 _s_h_e_l_l Type: path @@ -7489,19 +7479,20 @@ Command to use when spawning a subshell. By default, the user's login shell from /etc/passwd is used. - The Mutt Next Generation E-Mail Client 142 - - _6_._4_._2_5_0 _s_i_d_e_b_a_r___b_o_u_n_d_a_r_y + _6_._4_._2_4_9 _s_i_d_e_b_a_r___b_o_u_n_d_a_r_y Type: string Default: '.' When the sidebar is displayed and _$_s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y (section - 6.4.254 , page 142) is _s_e_t, this variable specifies the characters at which to + 6.4.253 , page 141) is _s_e_t, this variable specifies the characters at which to + + The Mutt Next Generation E-Mail Client 142 + split a folder name into ``hierarchy items.'' - _6_._4_._2_5_1 _s_i_d_e_b_a_r___d_e_l_i_m + _6_._4_._2_5_0 _s_i_d_e_b_a_r___d_e_l_i_m Type: string @@ -7510,7 +7501,7 @@ This specifies the delimiter between the sidebar (if visible) and other screens. - _6_._4_._2_5_2 _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y + _6_._4_._2_5_1 _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y Type: boolean @@ -7518,7 +7509,7 @@ If _s_e_t, only folders with new mail will be shown in the sidebar. - _6_._4_._2_5_3 _s_i_d_e_b_a_r___n_u_m_b_e_r___f_o_r_m_a_t + _6_._4_._2_5_2 _s_i_d_e_b_a_r___n_u_m_b_e_r___f_o_r_m_a_t Type: string @@ -7544,8 +7535,6 @@ %M Total number of messages shown, i.e. not hidden by a limit. 1) - The Mutt Next Generation E-Mail Client 143 - %n Number of new messages. @@ -7555,7 +7544,9 @@ 1) These expandos only have a non-zero value for the current mailbox and will always be zero otherwise. - _6_._4_._2_5_4 _s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y + The Mutt Next Generation E-Mail Client 143 + + _6_._4_._2_5_3 _s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y Type: boolean @@ -7563,15 +7554,15 @@ When _s_e_t, the ``hierarchy'' of the sidebar entries will be shortened only if they cannot be printed in full length (because ``_$_s_i_d_e_b_a_r___w_i_d_t_h (section - 6.4.256 , page 142)'' is set to a too low value). For example, if the news- + 6.4.255 , page 142)'' is set to a too low value). For example, if the news- group name ``de.alt.sysadmin.recovery'' doesn't fit on the screen, it'll get shortened ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will not get shortened. At which characters this compression is done is controled via the _$_s_i_d_e_- - _b_a_r___b_o_u_n_d_a_r_y (section 6.4.250 , page 140) variable. + _b_a_r___b_o_u_n_d_a_r_y (section 6.4.249 , page 140) variable. - _6_._4_._2_5_5 _s_i_d_e_b_a_r___v_i_s_i_b_l_e + _6_._4_._2_5_4 _s_i_d_e_b_a_r___v_i_s_i_b_l_e Type: boolean @@ -7580,7 +7571,7 @@ This specifies whether or not to show the sidebar (a list of folders specified with the ``mailboxes'' command). - _6_._4_._2_5_6 _s_i_d_e_b_a_r___w_i_d_t_h + _6_._4_._2_5_5 _s_i_d_e_b_a_r___w_i_d_t_h Type: number @@ -7588,35 +7579,35 @@ The width of the sidebar. - _6_._4_._2_5_7 _s_i_g___d_a_s_h_e_s + _6_._4_._2_5_6 _s_i_g___d_a_s_h_e_s Type: boolean Default: yes If set, a line containing ``-- '' (dash, dash, space) will be inserted before - your ``_$_s_i_g_n_a_t_u_r_e (section 6.4.259 , page 143)''. It is ssttrroonnggllyy recommended + your ``_$_s_i_g_n_a_t_u_r_e (section 6.4.258 , page 142)''. It is ssttrroonnggllyy recommended that you not unset this variable unless your ``signature'' contains just your name. The reason for this is because many software packages use ``-- \n'' to detect your signature. - The Mutt Next Generation E-Mail Client 144 - For example, Mutt-ng has the ability to highlight the signature in a different color in the builtin pager. - _6_._4_._2_5_8 _s_i_g___o_n___t_o_p + _6_._4_._2_5_7 _s_i_g___o_n___t_o_p Type: boolean Default: no + The Mutt Next Generation E-Mail Client 144 + If _s_e_t, the signature will be included before any quoted or forwarded text. It is ssttrroonnggllyy 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. - _6_._4_._2_5_9 _s_i_g_n_a_t_u_r_e + _6_._4_._2_5_8 _s_i_g_n_a_t_u_r_e Type: path @@ -7626,7 +7617,7 @@ messages. If the filename ends with a pipe (``|''), it is assumed that file- name is a shell command and input should be read from its stdout. - _6_._4_._2_6_0 _s_i_g_n_o_f_f___s_t_r_i_n_g + _6_._4_._2_5_9 _s_i_g_n_o_f_f___s_t_r_i_n_g Type: string @@ -7639,7 +7630,7 @@ witty quotes into your mails, better use a signature file instead of the sig- noff string. - _6_._4_._2_6_1 _s_i_m_p_l_e___s_e_a_r_c_h + _6_._4_._2_6_0 _s_i_m_p_l_e___s_e_a_r_c_h Type: string @@ -7655,9 +7646,7 @@ ~f joe | ~s joe - The Mutt Next Generation E-Mail Client 145 - - _6_._4_._2_6_2 _s_l_e_e_p___t_i_m_e + _6_._4_._2_6_1 _s_l_e_e_p___t_i_m_e Type: number @@ -7668,7 +7657,9 @@ the current folder. The default is to pause one second, so a value of zero for this option suppresses the pause. - _6_._4_._2_6_3 _s_m_a_r_t___w_r_a_p + The Mutt Next Generation E-Mail Client 145 + + _6_._4_._2_6_2 _s_m_a_r_t___w_r_a_p Type: boolean @@ -7676,20 +7667,20 @@ Controls the display of lines longer than the screen width in the internal pager. If _s_e_t, long lines are wrapped at a word boundary. If _u_n_s_e_t, lines are - simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 6.4.121 , + simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 6.4.120 , page 110)'' variable. - _6_._4_._2_6_4 _s_m_i_l_e_y_s + _6_._4_._2_6_3 _s_m_i_l_e_y_s Type: regular expression Default: '(>From )|(:[-^]?[][)(><}{|/DP])' The _p_a_g_e_r uses this variable to catch some common false positives of - ``_$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225 , page 134)'', most notably smileys in the + ``_$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.224 , page 134)'', most notably smileys in the beginning of a line - _6_._4_._2_6_5 _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l + _6_._4_._2_6_4 _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l Type: boolean @@ -7699,7 +7690,7 @@ cate about to be added to the database or not. It is _s_e_t by default. (S/MIME only) - _6_._4_._2_6_6 _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n + _6_._4_._2_6_5 _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n Type: path @@ -7708,12 +7699,10 @@ This variable contains the name of either a directory, or a file which contains trusted certificates for use with OpenSSL. (S/MIME only) - _6_._4_._2_6_7 _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s + _6_._4_._2_6_6 _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s Type: path - The Mutt Next Generation E-Mail Client 146 - Default: '' Since there is no pubring/secring as with PGP, Mutt-ng has to handle storage @@ -7723,7 +7712,9 @@ address keyid pairs, and which can be manually edited. This one points to the location of the certificates. (S/MIME only) - _6_._4_._2_6_8 _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d + The Mutt Next Generation E-Mail Client 146 + + _6_._4_._2_6_7 _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d Type: string @@ -7743,7 +7734,7 @@ multipart/signed attachment when verifying it. %k - The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 6.4.270 , + The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 6.4.269 , page 145) %c @@ -7754,37 +7745,37 @@ %C CA location: Depending on whether _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section - 6.4.266 , page 144) points to a directory or file, this expands to - '-CApath _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.266 , page 144)' or - '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.266 , page 144)'. + 6.4.265 , page 144) points to a directory or file, this expands to + '-CApath _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.265 , page 144)' or + '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.265 , page 144)'. For examples on how to configure these formats, see the smime.rc in the sam- ples/ subdirectory which has been installed on your system alongside the docu- mentation. (S/MIME only) - _6_._4_._2_6_9 _s_m_i_m_e___d_e_c_r_y_p_t___u_s_e___d_e_f_a_u_l_t___k_e_y + _6_._4_._2_6_8 _s_m_i_m_e___d_e_c_r_y_p_t___u_s_e___d_e_f_a_u_l_t___k_e_y Type: boolean Default: yes - The Mutt Next Generation E-Mail Client 147 - If _s_e_t (default) this tells Mutt-ng to use the default key for decryption. Oth- erwise, if manage multiple certificate-key-pairs, Mutt-ng 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) - _6_._4_._2_7_0 _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y + _6_._4_._2_6_9 _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y Type: string + The Mutt Next Generation E-Mail Client 147 + Default: '' This is the default key-pair to use for signing. This must be set to the keyid (the hash-value that OpenSSL generates) to work properly (S/MIME only) - _6_._4_._2_7_1 _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d + _6_._4_._2_7_0 _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d Type: string @@ -7792,7 +7783,7 @@ This command is used to create encrypted S/MIME messages. (S/MIME only) - _6_._4_._2_7_2 _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h + _6_._4_._2_7_1 _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h Type: string @@ -7803,7 +7794,7 @@ If _u_n_s_e_t ``_3_d_e_s'' (TripleDES) is used. (S/MIME only) - _6_._4_._2_7_3 _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d + _6_._4_._2_7_2 _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d Type: string @@ -7812,7 +7803,7 @@ This command is used to extract X509 certificates from a PKCS7 structure. (S/MIME only) - _6_._4_._2_7_4 _s_m_i_m_e___g_e_t___c_e_r_t___e_m_a_i_l___c_o_m_m_a_n_d + _6_._4_._2_7_3 _s_m_i_m_e___g_e_t___c_e_r_t___e_m_a_i_l___c_o_m_m_a_n_d Type: string @@ -7822,9 +7813,7 @@ tificates, and for verification purposes (to check whether the certificate was issued for the sender's mailbox). (S/MIME only) - _6_._4_._2_7_5 _s_m_i_m_e___g_e_t___s_i_g_n_e_r___c_e_r_t___c_o_m_m_a_n_d - - The Mutt Next Generation E-Mail Client 148 + _6_._4_._2_7_4 _s_m_i_m_e___g_e_t___s_i_g_n_e_r___c_e_r_t___c_o_m_m_a_n_d Type: string @@ -7834,7 +7823,9 @@ signature, so that the certificate's owner may get compared to the email's ``From:'' header field. (S/MIME only) - _6_._4_._2_7_6 _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d + The Mutt Next Generation E-Mail Client 148 + + _6_._4_._2_7_5 _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d Type: string @@ -7842,7 +7833,7 @@ This command is used to import a certificate via smime_keysng. (S/MIME only) - _6_._4_._2_7_7 _s_m_i_m_e___i_s___d_e_f_a_u_l_t + _6_._4_._2_7_6 _s_m_i_m_e___i_s___d_e_f_a_u_l_t Type: boolean @@ -7857,7 +7848,7 @@ (Note that this variable can be overridden by unsetting _$_c_r_y_p_t___a_u_t_o_s_m_i_m_e (sec- tion 6.4.37 , page 89).) (S/MIME only) - _6_._4_._2_7_8 _s_m_i_m_e___k_e_y_s + _6_._4_._2_7_7 _s_m_i_m_e___k_e_y_s Type: path @@ -7870,7 +7861,7 @@ address keyid pair, and which can be manually edited. This one points to the location of the private keys. (S/MIME only) - _6_._4_._2_7_9 _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d + _6_._4_._2_7_8 _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d Type: string @@ -7879,9 +7870,7 @@ This command is used to extract PKCS7 structures of S/MIME signatures, in order to extract the public X509 certificate(s). (S/MIME only) - The Mutt Next Generation E-Mail Client 149 - - _6_._4_._2_8_0 _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d + _6_._4_._2_7_9 _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d Type: string @@ -7890,7 +7879,9 @@ This command is used to created S/MIME signatures of type multipart/signed, which can be read by all mail clients. (S/MIME only) - _6_._4_._2_8_1 _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d + The Mutt Next Generation E-Mail Client 149 + + _6_._4_._2_8_0 _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d Type: string @@ -7900,7 +7891,7 @@ pkcs7-signature, which can only be handled by mail clients supporting the S/MIME extension. (S/MIME only) - _6_._4_._2_8_2 _s_m_i_m_e___t_i_m_e_o_u_t + _6_._4_._2_8_1 _s_m_i_m_e___t_i_m_e_o_u_t Type: number @@ -7909,7 +7900,7 @@ The number of seconds after which a cached passphrase will expire if not used. (S/MIME only) - _6_._4_._2_8_3 _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d + _6_._4_._2_8_2 _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d Type: string @@ -7918,7 +7909,7 @@ This command is used to verify S/MIME signatures of type multipart/signed. (S/MIME only) - _6_._4_._2_8_4 _s_m_i_m_e___v_e_r_i_f_y___o_p_a_q_u_e___c_o_m_m_a_n_d + _6_._4_._2_8_3 _s_m_i_m_e___v_e_r_i_f_y___o_p_a_q_u_e___c_o_m_m_a_n_d Type: string @@ -7927,7 +7918,7 @@ This command is used to verify S/MIME signatures of type application/x- pkcs7-mime. (S/MIME only) - _6_._4_._2_8_5 _s_m_t_p___a_u_t_h___p_a_s_s_w_o_r_d + _6_._4_._2_8_4 _s_m_t_p___a_u_t_h___p_a_s_s_w_o_r_d Type: string @@ -7935,16 +7926,16 @@ Availability: SMTP - The Mutt Next Generation E-Mail Client 150 - Defines the password to use with SMTP AUTH. If ``_$_s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e (section - 6.4.286 , page 148)'' is set, but this variable is not, you will be prompted + 6.4.285 , page 148)'' is set, but this variable is not, you will be prompted for a password when sending. NNoottee:: 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. - _6_._4_._2_8_6 _s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e + _6_._4_._2_8_5 _s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e + + The Mutt Next Generation E-Mail Client 150 Type: string @@ -7955,7 +7946,7 @@ Defines the username to use with SMTP AUTH. Setting this variable will cause Mutt-ng to attempt to use SMTP AUTH when sending. - _6_._4_._2_8_7 _s_m_t_p___h_o_s_t + _6_._4_._2_8_6 _s_m_t_p___h_o_s_t Type: string @@ -7965,9 +7956,9 @@ Defines the SMTP host which will be used to deliver mail, as opposed to invok- ing the sendmail binary. Setting this variable overrides the value of ``_$_s_e_n_d_- - _m_a_i_l (section 6.4.247 , page 140)'', and any associated variables. + _m_a_i_l (section 6.4.246 , page 139)'', and any associated variables. - _6_._4_._2_8_8 _s_m_t_p___p_o_r_t + _6_._4_._2_8_7 _s_m_t_p___p_o_r_t Type: number @@ -7981,7 +7972,7 @@ Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP servers will probably desire 587, the mail submission port. - _6_._4_._2_8_9 _s_o_r_t + _6_._4_._2_8_8 _s_o_r_t Type: sort order @@ -7989,8 +7980,6 @@ Specifies how to sort messages in the _i_n_d_e_x menu. Valid values are: - The Mutt Next Generation E-Mail Client 151 - date or date-sent date-received from @@ -8002,10 +7991,12 @@ threads to + The Mutt Next Generation E-Mail Client 151 + You may optionally use the ``reverse-'' prefix to specify reverse sorting order (example: set sort=reverse-date-sent). - _6_._4_._2_9_0 _s_o_r_t___a_l_i_a_s + _6_._4_._2_8_9 _s_o_r_t___a_l_i_a_s Type: sort order @@ -8018,7 +8009,7 @@ alias (sort alphabetically by alias name) unsorted (leave in order specified in .muttrc) - _6_._4_._2_9_1 _s_o_r_t___a_u_x + _6_._4_._2_9_0 _s_o_r_t___a_u_x Type: sort order @@ -8026,7 +8017,7 @@ When sorting by threads, this variable controls how threads are sorted in rela- tion to other threads, and how the branches of the thread trees are sorted. - This can be set to any value that ``_$_s_o_r_t (section 6.4.289 , page 149)'' can, + This can be set to any value that ``_$_s_o_r_t (section 6.4.288 , page 149)'' can, except threads (in that case, Mutt-ng will just use date-sent). You can also specify the ``last-'' prefix in addition to ``reverse-'' prefix, but last- must come after reverse-. The last- prefix causes messages to be sorted against its @@ -8037,13 +8028,11 @@ is received in a thread, that thread becomes the last one displayed (or the first, if you have set sort=reverse-threads.) - NNoottee:: For reversed ``_$_s_o_r_t (section 6.4.289 , page 149)'' order _$_s_o_r_t___a_u_x - (section 6.4.291 , page 150) is reversed again (which is not the right thing + NNoottee:: For reversed ``_$_s_o_r_t (section 6.4.288 , page 149)'' order _$_s_o_r_t___a_u_x + (section 6.4.290 , page 150) is reversed again (which is not the right thing to do, but kept to not break any existing configuration setting). - The Mutt Next Generation E-Mail Client 152 - - _6_._4_._2_9_2 _s_o_r_t___b_r_o_w_s_e_r + _6_._4_._2_9_1 _s_o_r_t___b_r_o_w_s_e_r Type: sort order @@ -8055,12 +8044,15 @@ alpha (alphabetically) date size + + The Mutt Next Generation E-Mail Client 152 + unsorted You may optionally use the ``reverse-'' prefix to specify reverse sorting order (example: set sort_browser=reverse-date). - _6_._4_._2_9_3 _s_o_r_t___r_e + _6_._4_._2_9_2 _s_o_r_t___r_e Type: boolean @@ -8068,41 +8060,38 @@ This variable is only useful when sorting by threads with ``_$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 6.4.309 , page 156)'' _u_n_s_e_t. In that case, it changes the heuristic - Mutt-ng uses to thread messages by subject. With _$_s_o_r_t___r_e (section 6.4.293 , - page 151) _s_e_t, Mutt-ng will only attach a message as the child of another mes- + Mutt-ng uses to thread messages by subject. With _$_s_o_r_t___r_e (section 6.4.292 , + page 150) _s_e_t, Mutt-ng will only attach a message as the child of another mes- sage by subject if the subject of the child message starts with a substring - matching the setting of ``_$_r_e_p_l_y___r_e_g_e_x_p (section 6.4.231 , page 136)''. With - _$_s_o_r_t___r_e (section 6.4.293 , page 151) _u_n_s_e_t, Mutt-ng will attach the message + matching the setting of ``_$_r_e_p_l_y___r_e_g_e_x_p (section 6.4.230 , page 136)''. With + _$_s_o_r_t___r_e (section 6.4.292 , page 150) _u_n_s_e_t, Mutt-ng will attach the message whether or not this is the case, as long as the non-``_$_r_e_p_l_y___r_e_g_e_x_p (section - 6.4.231 , page 136)'' parts of both messages are identical. + 6.4.230 , page 136)'' parts of both messages are identical. - _6_._4_._2_9_4 _s_p_a_m___s_e_p_a_r_a_t_o_r + _6_._4_._2_9_3 _s_p_a_m___s_e_p_a_r_a_t_o_r Type: string Default: ',' - ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.294 , page 151)'' controls what happens when + ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.293 , page 151)'' controls what happens when multiple spam headers are matched: if _u_n_s_e_t, each successive header will over- write any previous matches value for the spam label. If _s_e_t, each successive - match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.294 , + match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.293 , page 151)'' as a separator. - _6_._4_._2_9_5 _s_p_o_o_l_f_i_l_e + _6_._4_._2_9_4 _s_p_o_o_l_f_i_l_e Type: path Default: '' If your spool mailbox is in a non-default place where Mutt-ng cannot find it, - - The Mutt Next Generation E-Mail Client 153 - you can specify its location with this variable. Mutt-ng will automatically set this variable to the value of the environment variable $MAIL if it is not set. - _6_._4_._2_9_6 _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e + _6_._4_._2_9_5 _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e Type: path @@ -8112,9 +8101,11 @@ certificate that is signed with one of these CA certificates are also automati- cally accepted. + The Mutt Next Generation E-Mail Client 153 + Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt - _6_._4_._2_9_7 _s_s_l___c_l_i_e_n_t___c_e_r_t + _6_._4_._2_9_6 _s_s_l___c_l_i_e_n_t___c_e_r_t Type: path @@ -8124,6 +8115,18 @@ The file containing a client certificate and its associated private key. + _6_._4_._2_9_7 _s_s_l___f_o_r_c_e___t_l_s + + Type: boolean + + Default: no + + If this variable is _s_e_t, mutt-ng 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 ``_$_s_s_l___s_t_a_r_t_t_l_s (section + 6.4.299 , page 152)''. + _6_._4_._2_9_8 _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s Type: number @@ -8152,10 +8155,10 @@ Type: boolean - The Mutt Next Generation E-Mail Client 154 - Default: yes + The Mutt Next Generation E-Mail Client 154 + Availability: SSL This variables specifies whether to attempt to use SSLv2 in the SSL authentica- @@ -8208,11 +8211,10 @@ whether to write changes to a mailbox with the toggle-write operation, bound by default to ``%''). The fourth is used to indicate that the current folder has been opened in attach-message mode (Certain operations like composing a new + mail, replying, forwarding, etc. are not permitted in this mode). The Mutt Next Generation E-Mail Client 155 - mail, replying, forwarding, etc. are not permitted in this mode). - _6_._4_._3_0_5 _s_t_a_t_u_s___f_o_r_m_a_t Type: string @@ -8222,7 +8224,7 @@ %l?]---(%s/%S)-%>-(%P)---' Controls the format of the status line displayed in the _i_n_d_e_x menu. This - string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110 , page 105)'', but has + string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.109 , page 105)'', but has its own set of printf(3)-like sequences: %b @@ -8276,10 +8278,10 @@ to _$_s_t_a_t_u_s___c_h_a_r_s (section 6.4.304 , page 153) %s - current sorting mode (_$_s_o_r_t (section 6.4.289 , page 149)) + current sorting mode (_$_s_o_r_t (section 6.4.288 , page 149)) %S - current aux sorting method (_$_s_o_r_t___a_u_x (section 6.4.291 , page + current aux sorting method (_$_s_o_r_t___a_u_x (section 6.4.290 , page 150)) %t @@ -8387,7 +8389,7 @@ Default: no If _s_e_t, threading will only make use of the ``In-Reply-To:'' and ``Refer- - ences:'' header fields when you ``_$_s_o_r_t (section 6.4.289 , page 149)'' by mes- + ences:'' header fields when you ``_$_s_o_r_t (section 6.4.288 , page 149)'' by mes- sage threads. By default, messages with the same subject are grouped together in ``pseudo threads.'' This may not always be desirable, such as in a personal mailbox where you might have several unrelated messages with the subject ``hi'' @@ -8410,7 +8412,7 @@ Default: '\([Ww][Aa][RrSs]: .*\)[ ]*$' - When non-empty and _$_s_t_r_i_p___w_a_s (section 6.4.310 , page 156) is _s_e_t, mutt-ng + When non-empty and _$_s_t_r_i_p___w_a_s (section 6.4.310 , page 157) is _s_e_t, mutt-ng will remove this trailing part of the ``Subject'' line when replying if it won't be empty afterwards. @@ -8446,7 +8448,7 @@ like ordinary text. To actually make use of this format's features, you'll need support in your editor. - Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109 , page 105) is ignored when this + Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.108 , page 105) is ignored when this option is set. _6_._4_._3_1_5 _t_h_o_r_o_u_g_h___s_e_a_r_c_h @@ -8574,7 +8576,7 @@ which supports the -B8BITMIME flag (such as sendmail 8.8.x) or you may not be able to send mail. - When _s_e_t, Mutt-ng will invoke ``_$_s_e_n_d_m_a_i_l (section 6.4.247 , page 140)'' with + When _s_e_t, Mutt-ng will invoke ``_$_s_e_n_d_m_a_i_l (section 6.4.246 , page 139)'' with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP negotiation. _6_._4_._3_2_6 _u_s_e___d_o_m_a_i_n @@ -8706,7 +8708,7 @@ indicate progress. If set to 0, only a single message will be displayed before writing a mailbox. - Also see the ``_$_r_e_a_d___i_n_c (section 6.4.226 , page 135)'' variable. + Also see the ``_$_r_e_a_d___i_n_c (section 6.4.225 , page 134)'' variable. _6_._4_._3_3_8 _x_t_e_r_m___i_c_o_n @@ -9454,223 +9456,223 @@ 6.4.90 ignore_list_reply_to 102 6.4.91 imap_authenticators 102 6.4.92 imap_delim_chars 102 - 6.4.93 imap_force_ssl 103 - 6.4.94 imap_headers 103 - 6.4.95 imap_home_namespace 103 - 6.4.96 imap_keepalive 103 - 6.4.97 imap_list_subscribed 104 - 6.4.98 imap_login 104 - 6.4.99 imap_mail_check 104 - 6.4.100 imap_pass 104 - 6.4.101 imap_passive 105 - 6.4.102 imap_peek 105 - 6.4.103 imap_reconnect 105 - 6.4.104 imap_servernoise 105 - 6.4.105 imap_user 105 - 6.4.106 implicit_autoview 106 - 6.4.107 include 106 - 6.4.108 include_onlyfirst 106 - 6.4.109 indent_string 106 - 6.4.110 index_format 106 - 6.4.111 ispell 109 - 6.4.112 keep_flagged 109 - 6.4.113 list_reply 109 - 6.4.114 locale 110 - 6.4.115 mail_check 110 - 6.4.116 mailcap_path 110 - 6.4.117 mailcap_sanitize 110 - 6.4.118 maildir_header_cache_verify 110 - 6.4.119 maildir_trash 111 - 6.4.120 mark_old 111 - 6.4.121 markers 111 - 6.4.122 mask 111 - 6.4.123 max_line_length 112 - 6.4.124 mbox 112 - 6.4.125 mbox_type 112 - 6.4.126 menu_context 112 - 6.4.127 menu_move_off 112 - 6.4.128 menu_scroll 112 + 6.4.93 imap_headers 103 + 6.4.94 imap_home_namespace 103 + 6.4.95 imap_keepalive 103 + 6.4.96 imap_list_subscribed 103 + 6.4.97 imap_login 104 + 6.4.98 imap_mail_check 104 + 6.4.99 imap_pass 104 + 6.4.100 imap_passive 104 + 6.4.101 imap_peek 105 + 6.4.102 imap_reconnect 105 + 6.4.103 imap_servernoise 105 + 6.4.104 imap_user 105 + 6.4.105 implicit_autoview 105 + 6.4.106 include 106 + 6.4.107 include_onlyfirst 106 + 6.4.108 indent_string 106 + 6.4.109 index_format 106 + 6.4.110 ispell 109 + 6.4.111 keep_flagged 109 + 6.4.112 list_reply 109 + 6.4.113 locale 109 + 6.4.114 mail_check 110 + 6.4.115 mailcap_path 110 + 6.4.116 mailcap_sanitize 110 + 6.4.117 maildir_header_cache_verify 110 + 6.4.118 maildir_trash 110 + 6.4.119 mark_old 111 + 6.4.120 markers 111 + 6.4.121 mask 111 + 6.4.122 max_line_length 111 + 6.4.123 mbox 111 + 6.4.124 mbox_type 112 + 6.4.125 menu_context 112 + 6.4.126 menu_move_off 112 + 6.4.127 menu_scroll 112 + 6.4.128 message_format 112 v - 6.4.129 message_format 113 - 6.4.130 meta_key 113 - 6.4.131 metoo 113 - 6.4.132 mh_purge 113 - 6.4.133 mh_seq_flagged 113 - 6.4.134 mh_seq_replied 114 - 6.4.135 mh_seq_unseen 114 - 6.4.136 mime_forward 114 - 6.4.137 mime_forward_decode 114 - 6.4.138 mime_forward_rest 114 - 6.4.139 mix_entry_format 114 - 6.4.140 mixmaster 115 - 6.4.141 move 115 - 6.4.142 msgid_format 115 - 6.4.143 narrow_tree 116 - 6.4.144 nntp_ask_followup_to 117 - 6.4.145 nntp_ask_x_comment_to 117 - 6.4.146 nntp_cache_dir 117 - 6.4.147 nntp_catchup 117 - 6.4.148 nntp_context 117 - 6.4.149 nntp_followup_to_poster 118 - 6.4.150 nntp_group_index_format 118 - 6.4.151 nntp_host 118 - 6.4.152 nntp_inews 119 - 6.4.153 nntp_load_description 119 - 6.4.154 nntp_mail_check 119 - 6.4.155 nntp_mime_subject 120 - 6.4.156 nntp_newsrc 120 - 6.4.157 nntp_pass 120 - 6.4.158 nntp_post_moderated 120 - 6.4.159 nntp_reconnect 121 - 6.4.160 nntp_save_unsubscribed 121 - 6.4.161 nntp_show_new_news 121 - 6.4.162 nntp_show_only_unread 121 - 6.4.163 nntp_user 121 - 6.4.164 nntp_x_comment_to 122 - 6.4.165 operating_system 122 - 6.4.166 pager 122 - 6.4.167 pager_context 122 - 6.4.168 pager_format 123 - 6.4.169 pager_index_lines 123 - 6.4.170 pager_stop 123 - 6.4.171 pgp_auto_decode 123 - 6.4.172 pgp_autoinline 123 - 6.4.173 pgp_check_exit 124 - 6.4.174 pgp_clearsign_command 124 - 6.4.175 pgp_decode_command 124 - 6.4.176 pgp_decrypt_command 125 - 6.4.177 pgp_encrypt_only_command 125 - 6.4.178 pgp_encrypt_sign_command 125 - 6.4.179 pgp_entry_format 125 - 6.4.180 pgp_export_command 126 - 6.4.181 pgp_getkeys_command 126 + 6.4.129 meta_key 113 + 6.4.130 metoo 113 + 6.4.131 mh_purge 113 + 6.4.132 mh_seq_flagged 113 + 6.4.133 mh_seq_replied 113 + 6.4.134 mh_seq_unseen 113 + 6.4.135 mime_forward 114 + 6.4.136 mime_forward_decode 114 + 6.4.137 mime_forward_rest 114 + 6.4.138 mix_entry_format 114 + 6.4.139 mixmaster 115 + 6.4.140 move 115 + 6.4.141 msgid_format 115 + 6.4.142 narrow_tree 116 + 6.4.143 nntp_ask_followup_to 116 + 6.4.144 nntp_ask_x_comment_to 117 + 6.4.145 nntp_cache_dir 117 + 6.4.146 nntp_catchup 117 + 6.4.147 nntp_context 117 + 6.4.148 nntp_followup_to_poster 117 + 6.4.149 nntp_group_index_format 118 + 6.4.150 nntp_host 118 + 6.4.151 nntp_inews 119 + 6.4.152 nntp_load_description 119 + 6.4.153 nntp_mail_check 119 + 6.4.154 nntp_mime_subject 119 + 6.4.155 nntp_newsrc 120 + 6.4.156 nntp_pass 120 + 6.4.157 nntp_post_moderated 120 + 6.4.158 nntp_reconnect 120 + 6.4.159 nntp_save_unsubscribed 121 + 6.4.160 nntp_show_new_news 121 + 6.4.161 nntp_show_only_unread 121 + 6.4.162 nntp_user 121 + 6.4.163 nntp_x_comment_to 121 + 6.4.164 operating_system 122 + 6.4.165 pager 122 + 6.4.166 pager_context 122 + 6.4.167 pager_format 122 + 6.4.168 pager_index_lines 123 + 6.4.169 pager_stop 123 + 6.4.170 pgp_auto_decode 123 + 6.4.171 pgp_autoinline 123 + 6.4.172 pgp_check_exit 124 + 6.4.173 pgp_clearsign_command 124 + 6.4.174 pgp_decode_command 124 + 6.4.175 pgp_decrypt_command 125 + 6.4.176 pgp_encrypt_only_command 125 + 6.4.177 pgp_encrypt_sign_command 125 + 6.4.178 pgp_entry_format 125 + 6.4.179 pgp_export_command 126 + 6.4.180 pgp_getkeys_command 126 + 6.4.181 pgp_good_sign 126 vi - 6.4.182 pgp_good_sign 126 - 6.4.183 pgp_ignore_subkeys 126 - 6.4.184 pgp_import_command 127 - 6.4.185 pgp_list_pubring_command 127 - 6.4.186 pgp_list_secring_command 127 - 6.4.187 pgp_long_ids 127 - 6.4.188 pgp_mime_auto 127 - 6.4.189 pgp_replyinline 128 - 6.4.190 pgp_retainable_sigs 128 - 6.4.191 pgp_show_unusable 128 - 6.4.192 pgp_sign_as 128 - 6.4.193 pgp_sign_command 129 - 6.4.194 pgp_sort_keys 129 - 6.4.195 pgp_strict_enc 129 - 6.4.196 pgp_timeout 129 - 6.4.197 pgp_use_gpg_agent 130 - 6.4.198 pgp_verify_command 130 - 6.4.199 pgp_verify_key_command 130 - 6.4.200 pipe_decode 130 - 6.4.201 pipe_sep 130 - 6.4.202 pipe_split 130 - 6.4.203 pop_auth_try_all 131 - 6.4.204 pop_authenticators 131 - 6.4.205 pop_delete 131 - 6.4.206 pop_host 131 - 6.4.207 pop_last 132 - 6.4.208 pop_mail_check 132 - 6.4.209 pop_pass 132 - 6.4.210 pop_reconnect 132 - 6.4.211 pop_user 133 - 6.4.212 post_indent_string 133 - 6.4.213 postpone 133 - 6.4.214 postponed 133 - 6.4.215 preconnect 133 - 6.4.216 print 134 - 6.4.217 print_command 134 - 6.4.218 print_decode 134 - 6.4.219 print_split 134 - 6.4.220 prompt_after 135 - 6.4.221 query_command 135 - 6.4.222 quit 135 - 6.4.223 quote_empty 135 - 6.4.224 quote_quoted 135 - 6.4.225 quote_regexp 136 - 6.4.226 read_inc 136 - 6.4.227 read_only 136 - 6.4.228 realname 136 - 6.4.229 recall 136 - 6.4.230 record 137 - 6.4.231 reply_regexp 137 - 6.4.232 reply_self 137 - 6.4.233 reply_to 137 - 6.4.234 resolve 138 + 6.4.182 pgp_ignore_subkeys 126 + 6.4.183 pgp_import_command 126 + 6.4.184 pgp_list_pubring_command 127 + 6.4.185 pgp_list_secring_command 127 + 6.4.186 pgp_long_ids 127 + 6.4.187 pgp_mime_auto 127 + 6.4.188 pgp_replyinline 127 + 6.4.189 pgp_retainable_sigs 128 + 6.4.190 pgp_show_unusable 128 + 6.4.191 pgp_sign_as 128 + 6.4.192 pgp_sign_command 128 + 6.4.193 pgp_sort_keys 129 + 6.4.194 pgp_strict_enc 129 + 6.4.195 pgp_timeout 129 + 6.4.196 pgp_use_gpg_agent 129 + 6.4.197 pgp_verify_command 130 + 6.4.198 pgp_verify_key_command 130 + 6.4.199 pipe_decode 130 + 6.4.200 pipe_sep 130 + 6.4.201 pipe_split 130 + 6.4.202 pop_auth_try_all 130 + 6.4.203 pop_authenticators 131 + 6.4.204 pop_delete 131 + 6.4.205 pop_host 131 + 6.4.206 pop_last 132 + 6.4.207 pop_mail_check 132 + 6.4.208 pop_pass 132 + 6.4.209 pop_reconnect 132 + 6.4.210 pop_user 132 + 6.4.211 post_indent_string 133 + 6.4.212 postpone 133 + 6.4.213 postponed 133 + 6.4.214 preconnect 133 + 6.4.215 print 134 + 6.4.216 print_command 134 + 6.4.217 print_decode 134 + 6.4.218 print_split 134 + 6.4.219 prompt_after 134 + 6.4.220 query_command 135 + 6.4.221 quit 135 + 6.4.222 quote_empty 135 + 6.4.223 quote_quoted 135 + 6.4.224 quote_regexp 135 + 6.4.225 read_inc 136 + 6.4.226 read_only 136 + 6.4.227 realname 136 + 6.4.228 recall 136 + 6.4.229 record 136 + 6.4.230 reply_regexp 137 + 6.4.231 reply_self 137 + 6.4.232 reply_to 137 + 6.4.233 resolve 137 + 6.4.234 reverse_alias 138 vii - 6.4.235 reverse_alias 138 - 6.4.236 reverse_name 138 - 6.4.237 reverse_realname 138 - 6.4.238 rfc2047_parameters 139 - 6.4.239 save_address 139 - 6.4.240 save_empty 139 - 6.4.241 save_name 139 - 6.4.242 score 140 - 6.4.243 score_threshold_delete 140 - 6.4.244 score_threshold_flag 140 - 6.4.245 score_threshold_read 140 - 6.4.246 send_charset 140 - 6.4.247 sendmail 141 - 6.4.248 sendmail_wait 141 - 6.4.249 shell 141 - 6.4.250 sidebar_boundary 142 - 6.4.251 sidebar_delim 142 - 6.4.252 sidebar_newmail_only 142 - 6.4.253 sidebar_number_format 142 - 6.4.254 sidebar_shorten_hierarchy 143 - 6.4.255 sidebar_visible 143 - 6.4.256 sidebar_width 143 - 6.4.257 sig_dashes 143 - 6.4.258 sig_on_top 144 - 6.4.259 signature 144 - 6.4.260 signoff_string 144 - 6.4.261 simple_search 144 - 6.4.262 sleep_time 145 - 6.4.263 smart_wrap 145 - 6.4.264 smileys 145 - 6.4.265 smime_ask_cert_label 145 - 6.4.266 smime_ca_location 145 - 6.4.267 smime_certificates 145 - 6.4.268 smime_decrypt_command 146 - 6.4.269 smime_decrypt_use_default_key 146 - 6.4.270 smime_default_key 147 - 6.4.271 smime_encrypt_command 147 - 6.4.272 smime_encrypt_with 147 - 6.4.273 smime_get_cert_command 147 - 6.4.274 smime_get_cert_email_command 147 - 6.4.275 smime_get_signer_cert_command 147 - 6.4.276 smime_import_cert_command 148 - 6.4.277 smime_is_default 148 - 6.4.278 smime_keys 148 - 6.4.279 smime_pk7out_command 148 - 6.4.280 smime_sign_command 149 - 6.4.281 smime_sign_opaque_command 149 - 6.4.282 smime_timeout 149 - 6.4.283 smime_verify_command 149 - 6.4.284 smime_verify_opaque_command 149 - 6.4.285 smtp_auth_password 149 - 6.4.286 smtp_auth_username 150 - 6.4.287 smtp_host 150 + 6.4.235 reverse_name 138 + 6.4.236 reverse_realname 138 + 6.4.237 rfc2047_parameters 138 + 6.4.238 save_address 139 + 6.4.239 save_empty 139 + 6.4.240 save_name 139 + 6.4.241 score 140 + 6.4.242 score_threshold_delete 140 + 6.4.243 score_threshold_flag 140 + 6.4.244 score_threshold_read 140 + 6.4.245 send_charset 140 + 6.4.246 sendmail 141 + 6.4.247 sendmail_wait 141 + 6.4.248 shell 141 + 6.4.249 sidebar_boundary 141 + 6.4.250 sidebar_delim 142 + 6.4.251 sidebar_newmail_only 142 + 6.4.252 sidebar_number_format 142 + 6.4.253 sidebar_shorten_hierarchy 143 + 6.4.254 sidebar_visible 143 + 6.4.255 sidebar_width 143 + 6.4.256 sig_dashes 143 + 6.4.257 sig_on_top 143 + 6.4.258 signature 144 + 6.4.259 signoff_string 144 + 6.4.260 simple_search 144 + 6.4.261 sleep_time 144 + 6.4.262 smart_wrap 145 + 6.4.263 smileys 145 + 6.4.264 smime_ask_cert_label 145 + 6.4.265 smime_ca_location 145 + 6.4.266 smime_certificates 145 + 6.4.267 smime_decrypt_command 146 + 6.4.268 smime_decrypt_use_default_key 146 + 6.4.269 smime_default_key 146 + 6.4.270 smime_encrypt_command 147 + 6.4.271 smime_encrypt_with 147 + 6.4.272 smime_get_cert_command 147 + 6.4.273 smime_get_cert_email_command 147 + 6.4.274 smime_get_signer_cert_command 147 + 6.4.275 smime_import_cert_command 148 + 6.4.276 smime_is_default 148 + 6.4.277 smime_keys 148 + 6.4.278 smime_pk7out_command 148 + 6.4.279 smime_sign_command 148 + 6.4.280 smime_sign_opaque_command 149 + 6.4.281 smime_timeout 149 + 6.4.282 smime_verify_command 149 + 6.4.283 smime_verify_opaque_command 149 + 6.4.284 smtp_auth_password 149 + 6.4.285 smtp_auth_username 149 + 6.4.286 smtp_host 150 + 6.4.287 smtp_port 150 viii - 6.4.288 smtp_port 150 - 6.4.289 sort 150 - 6.4.290 sort_alias 151 - 6.4.291 sort_aux 151 - 6.4.292 sort_browser 152 - 6.4.293 sort_re 152 - 6.4.294 spam_separator 152 - 6.4.295 spoolfile 152 - 6.4.296 ssl_ca_certificates_file 153 - 6.4.297 ssl_client_cert 153 + 6.4.288 sort 150 + 6.4.289 sort_alias 151 + 6.4.290 sort_aux 151 + 6.4.291 sort_browser 151 + 6.4.292 sort_re 152 + 6.4.293 spam_separator 152 + 6.4.294 spoolfile 152 + 6.4.295 ssl_ca_certificates_file 152 + 6.4.296 ssl_client_cert 153 + 6.4.297 ssl_force_tls 153 6.4.298 ssl_min_dh_prime_bits 153 6.4.299 ssl_starttls 153 6.4.300 ssl_use_sslv2 153 diff --git a/imap/browse.c b/imap/browse.c index 85e55e0..6e777c4 100644 --- a/imap/browse.c +++ b/imap/browse.c @@ -77,7 +77,6 @@ int imap_browse (char *path, struct browser_state *state) home_namespace = 1; mbox[0] = '\0'; /* Do not replace "" with "INBOX" here */ mx.mbox = safe_strdup (ImapHomeNamespace); - nns = 0; if (mutt_bit_isset (idata->capabilities, NAMESPACE)) { mutt_message _("Getting namespaces..."); diff --git a/imap/imap.c b/imap/imap.c index 6b37230..202a10d 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -26,6 +26,7 @@ #if defined(USE_SSL) || defined(USE_GNUTLS) # include "mutt_ssl.h" #endif +#include "buffy.h" #include "lib/mem.h" #include "lib/intl.h" @@ -399,10 +400,6 @@ int imap_open_connection (IMAP_DATA * idata) idata->state = IMAP_CONNECTED; if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE) { - mutt_error (_("Unexpected response received from server: %s"), - idata->cmd.buf); - mutt_sleep (1); - mutt_socket_close (idata->conn); idata->state = IMAP_DISCONNECTED; return -1; @@ -414,11 +411,14 @@ int imap_open_connection (IMAP_DATA * idata) goto bail; #if defined(USE_SSL) || defined(USE_GNUTLS) /* Attempt STARTTLS if available and desired. */ - if (mutt_bit_isset (idata->capabilities, STARTTLS) && !idata->conn->ssf) { + if (!idata->conn->ssf && (option(OPTSSLFORCETLS) || + mutt_bit_isset (idata->capabilities, STARTTLS))) { int rc; - if ((rc = query_quadoption (OPT_SSLSTARTTLS, - _("Secure connection with TLS?"))) == -1) + if (option (OPTSSLFORCETLS)) + rc = M_YES; + else if ((rc = query_quadoption (OPT_SSLSTARTTLS, + _("Secure connection with TLS?"))) == -1) goto err_close_conn; if (rc == M_YES) { if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1) @@ -442,6 +442,12 @@ int imap_open_connection (IMAP_DATA * idata) } } } + + if (option(OPTSSLFORCETLS) && ! idata->conn->ssf) { + mutt_error _("Encrypted connection unavailable"); + mutt_sleep (1); + goto err_close_conn; + } #endif } else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0) { @@ -1325,10 +1331,69 @@ fail: return -1; } +/* trim dest to the length of the longest prefix it shares with src, + * returning the length of the trimmed string */ +static int longest_common_prefix (char *dest, const char* src, + int start, size_t dlen) { + int pos = start; + + while (pos < dlen && dest[pos] && dest[pos] == src[pos]) + pos++; + dest[pos] = '\0'; + + return pos; +} + +/* look for IMAP URLs to complete from defined mailboxes. Could be extended + * to complete over open connections and account/folder hooks too. */ +static int imap_complete_hosts (char *dest, size_t len) { + BUFFY* mailbox; + CONNECTION* conn; + int rc = -1; + int matchlen; + int i = 0; + + matchlen = mutt_strlen (dest); + if (list_empty (Incoming)) + return (-1); + for (i = 0; i < Incoming->length; i++) { + mailbox = (BUFFY*) Incoming->data[i]; + if (!safe_strncmp (dest, mailbox->path, matchlen)) { + if (rc) { + strfcpy (dest, mailbox->path, len); + rc = 0; + } else + longest_common_prefix (dest, mailbox->path, matchlen, len); + } + } + + for (conn = mutt_socket_head (); conn->next; conn = conn->next) { + ciss_url_t url; + char urlstr[LONG_STRING]; + + if (conn->account.type != M_ACCT_TYPE_IMAP) + continue; + + mutt_account_tourl (&conn->account, &url); + /* FIXME: how to handle multiple users on the same host? */ + url.user = NULL; + url.path = NULL; + url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0); + if (!safe_strncmp (dest, urlstr, matchlen)) { + if (rc) { + strfcpy (dest, urlstr, len); + rc = 0; + } else + longest_common_prefix (dest, urlstr, matchlen, len); + } + } + + return rc; +} + /* imap_complete: given a partial IMAP folder path, return a string which * adds as much to the path as is unique */ -int imap_complete (char *dest, size_t dlen, char *path) -{ +int imap_complete (char *dest, size_t dlen, char *path) { CONNECTION *conn; IMAP_DATA *idata; char list[LONG_STRING]; @@ -1339,18 +1404,20 @@ int imap_complete (char *dest, size_t dlen, char *path) char completion[LONG_STRING]; int clen, matchlen = 0; int completions = 0; - int pos = 0; IMAP_MBOX mx; - /* verify passed in path is an IMAP path */ - if (imap_parse_path (path, &mx)) { - debug_print (2, ("bad path %s\n", path)); - return -1; + if (imap_parse_path (path, &mx) || !mx.mbox) { + strfcpy (dest, path, dlen); + return imap_complete_hosts (dest, dlen); } - /* don't open a new socket just for completion */ - if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) - goto fail; + /* don't open a new socket just for completion. Instead complete over + * known mailboxes/hooks/etc */ + if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) { + FREE (&mx.mbox); + strfcpy (dest, path, dlen); + return imap_complete_hosts (dest, dlen); + } conn = idata->conn; /* reformat path for IMAP list, and append wildcard */ @@ -1392,13 +1459,7 @@ int imap_complete (char *dest, size_t dlen, char *path) continue; } - pos = 0; - while (pos < matchlen && list_word[pos] && - completion[pos] == list_word[pos]) - pos++; - completion[pos] = '\0'; - matchlen = pos; - + matchlen = longest_common_prefix (completion, list_word, 0, matchlen); completions++; } } @@ -1413,8 +1474,6 @@ int imap_complete (char *dest, size_t dlen, char *path) return 0; } -fail: - FREE (&mx.mbox); return -1; } diff --git a/imap/util.c b/imap/util.c index 9c69ebf..5163da7 100644 --- a/imap/util.c +++ b/imap/util.c @@ -110,11 +110,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) FREE (&c); -#if defined(USE_SSL) || defined(USE_GNUTLS) - if (option (OPTIMAPFORCESSL)) - mx->account.flags |= M_ACCT_SSL; -#endif - if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT)) mx->account.port = ImapsPort; diff --git a/init.c b/init.c index 0d7bbbe..3613ae6 100644 --- a/init.c +++ b/init.c @@ -286,7 +286,7 @@ int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags) } } else { - for (pc = tok->dptr; isalpha ((unsigned char) *pc) || *pc == '_'; + for (pc = tok->dptr; isalnum ((unsigned char) *pc) || *pc == '_'; pc++); var = str_substrdup (tok->dptr, pc); tok->dptr = pc; diff --git a/init.h b/init.h index de6c9dc..f7745f2 100644 --- a/init.h +++ b/init.h @@ -949,17 +949,6 @@ struct option_t MuttVars[] = { ** as folder separators for displaying IMAP paths. In particular it ** helps in using the '\fT=\fP' shortcut for your $$folder variable. */ -# if defined(USE_SSL) || defined(USE_GNUTLS) - {"imap_force_ssl", DT_BOOL, R_NONE, OPTIMAPFORCESSL, 0}, - /* - ** .pp - ** Availability: IMAP and SSL or IMAP and GNUTLS - ** - ** .pp - ** If this variable is \fIset\fP, Mutt-ng will always use SSL when - ** connecting to IMAP servers. - */ -# endif {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, UL 0}, /* ** .pp @@ -2403,8 +2392,16 @@ struct option_t MuttVars[] = { ** The file containing a client certificate and its associated private ** key. */ -#endif -# if defined(USE_SSL)||defined(USE_GNUTLS) +#endif /* USE_SSL */ + {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, 0 }, + /* + ** .pp + ** If this variable is \fIset\fP, mutt-ng 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, M_YES}, /* ** .pp @@ -2415,7 +2412,6 @@ struct option_t MuttVars[] = { ** advertising the capability. When \fIunset\fP, Mutt-ng will not attempt to ** use STARTTLS regardless of the server's capabilities. */ -# endif {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"}, /* ** .pp @@ -2463,7 +2459,7 @@ struct option_t MuttVars[] = { ** This variables specifies whether to attempt to use SSLv2 in the ** SSL authentication process. */ -# endif +# endif /* _MAKEDOC || !USE_GNUTLS */ {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1}, /* ** .pp @@ -2482,7 +2478,7 @@ struct option_t MuttVars[] = { ** This variables specifies whether to attempt to use TLSv1 in the ** SSL authentication process. */ -#ifdef USE_GNUTLS +# ifdef USE_GNUTLS {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, 0}, /* ** .pp @@ -2502,8 +2498,8 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt\fP */ -#endif -#endif +# endif /* USE_GNUTLS */ +# endif /* USE_SSL || USE_GNUTLS */ {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, 0}, /* ** .pp diff --git a/lib.c b/lib.c index a81ecda..096f57f 100644 --- a/lib.c +++ b/lib.c @@ -28,6 +28,12 @@ #include #include +#ifdef HAVE_SYSEXITS_H +#include +#else /* Make sure EX_OK is defined */ +#define EX_OK 0 +#endif + #include "lib.h" #include "lib/mem.h" @@ -36,6 +42,62 @@ extern short Umask; +static struct sysexits +{ + int v; + const char *str; +} +sysexits_h[] = +{ +#ifdef EX_USAGE + { 0xff & EX_USAGE, "Bad usage." }, +#endif +#ifdef EX_DATAERR + { 0xff & EX_DATAERR, "Data format error." }, +#endif +#ifdef EX_NOINPUT + { 0xff & EX_NOINPUT, "Cannot open input." }, +#endif +#ifdef EX_NOUSER + { 0xff & EX_NOUSER, "User unknown." }, +#endif +#ifdef EX_NOHOST + { 0xff & EX_NOHOST, "Host unknown." }, +#endif +#ifdef EX_UNAVAILABLE + { 0xff & EX_UNAVAILABLE, "Service unavailable." }, +#endif +#ifdef EX_SOFTWARE + { 0xff & EX_SOFTWARE, "Internal error." }, +#endif +#ifdef EX_OSERR + { 0xff & EX_OSERR, "Operating system error." }, +#endif +#ifdef EX_OSFILE + { 0xff & EX_OSFILE, "System file missing." }, +#endif +#ifdef EX_CANTCREAT + { 0xff & EX_CANTCREAT, "Can't create output." }, +#endif +#ifdef EX_IOERR + { 0xff & EX_IOERR, "I/O error." }, +#endif +#ifdef EX_TEMPFAIL + { 0xff & EX_TEMPFAIL, "Deferred." }, +#endif +#ifdef EX_PROTOCOL + { 0xff & EX_PROTOCOL, "Remote protocol error." }, +#endif +#ifdef EX_NOPERM + { 0xff & EX_NOPERM, "Insufficient permission." }, +#endif +#ifdef EX_CONFIG + { 0xff & EX_NOPERM, "Local configuration error." }, +#endif + { S_ERR, "Exec error." }, + { -1, NULL} +}; + void mutt_nocurses_error (const char *fmt, ...) { va_list ap; @@ -432,3 +494,17 @@ const char *mutt_basename (const char *f) else return f; } + +const char * +mutt_strsysexit(int e) +{ + int i; + + for(i = 0; sysexits_h[i].str; i++) + { + if(e == sysexits_h[i].v) + break; + } + + return sysexits_h[i].str; +} diff --git a/lib.h b/lib.h index 5dc28bf..352ee6e 100644 --- a/lib.h +++ b/lib.h @@ -44,6 +44,10 @@ extern void (*mutt_error) (const char *, ...); # endif void mutt_exit (int); +/* Exit values used in send_msg() */ +#define S_ERR 127 +#define S_BKG 126 + /* The actual library functions. */ FILE *safe_fopen (const char *, const char *); @@ -68,4 +72,6 @@ void mutt_nocurses_error (const char *, ...); void mutt_sanitize_filename (char *, short); void mutt_unlink (const char *); +const char *mutt_strsysexit(int e); + #endif diff --git a/mutt.h b/mutt.h index 91c9999..3e712dc 100644 --- a/mutt.h +++ b/mutt.h @@ -382,20 +382,16 @@ enum { OPTIMAPPASSIVE, OPTIMAPPEEK, OPTIMAPSERVERNOISE, -# if defined(USE_SSL) || defined(USE_GNUTLS) - OPTIMAPFORCESSL, -# endif #endif #if defined(USE_SSL) || defined(USE_GNUTLS) # ifndef USE_GNUTLS + OPTSSLSYSTEMCERTS, OPTSSLV2, -# endif +# endif /* !USE_GNUTLS */ OPTSSLV3, OPTTLSV1, -# ifndef USE_GNUTLS - OPTSSLSYSTEMCERTS, -# endif -#endif + OPTSSLFORCETLS, +#endif /* USE_SSL || USE_GNUTLS */ OPTIMPLICITAUTOVIEW, OPTINCLUDEONLYFIRST, OPTKEEPFLAGGED, @@ -562,10 +558,6 @@ enum { #define toggle_option(x) mutt_bit_toggle(Options,x) #define option(x) mutt_bit_isset(Options,x) -/* Exit values used in send_msg() */ -#define S_ERR 127 -#define S_BKG 126 - typedef struct list_t { char *data; struct list_t *next; diff --git a/mutt_tunnel.c b/mutt_tunnel.c index 6cc092d..db5f50e 100644 --- a/mutt_tunnel.c +++ b/mutt_tunnel.c @@ -1,7 +1,7 @@ /* * Copyright notice from original mutt: * Copyright (C) 2000 Manoj Kasichainula - * Copyright (C) 2001 Brendan Cully + * Copyright (C) 2001,2005 Brendan Cully * * This file is part of mutt-ng, see http://www.muttng.org/. * It's licensed under the GNU General Public License, @@ -118,12 +118,18 @@ static int tunnel_socket_open (CONNECTION * conn) static int tunnel_socket_close (CONNECTION * conn) { TUNNEL_DATA *tunnel = (TUNNEL_DATA *) conn->sockdata; + int status; close (tunnel->readfd); close (tunnel->writefd); - waitpid (tunnel->pid, NULL, 0); + waitpid (tunnel->pid, &status, 0); + if (!WIFEXITED(status) || WEXITSTATUS(status)) { + mutt_error(_("Tunnel to %s returned error %d (%s)"), + conn->account.host, WEXITSTATUS(status), + NONULL(mutt_strsysexit(WEXITSTATUS(status)))); + mutt_sleep (2); + } FREE (&conn->sockdata); - return 0; } diff --git a/pager.c b/pager.c index 9d5444c..da23902 100644 --- a/pager.c +++ b/pager.c @@ -878,6 +878,24 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) return pos; } +/* trim tail of buf so that it contains complete multibyte characters */ +static int trim_incomplete_mbyte(unsigned char *buf, size_t len) { + mbstate_t mbstate; + size_t k; + + memset (&mbstate, 0, sizeof (mbstate)); + for (; len > 0; buf += k, len -= k) { + k = mbrtowc (NULL, (char *) buf, len, &mbstate); + if (k == -2) + break; + else if (k == -1 || k == 0) + k = 1; + } + *buf = '\0'; + + return len; +} + static int fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf, unsigned char *fmt, size_t blen, int *buf_ready) @@ -897,6 +915,11 @@ fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf, b_read = (int) (*last_pos - offset); *buf_ready = 1; + /* incomplete mbyte characters trigger a segfault in regex processing for + * certain versions of glibc. Trim them if necessary. */ + if (b_read == blen - 2) + b_read -= trim_incomplete_mbyte(buf, b_read); + /* copy "buf" to "fmt", but without bold and underline controls */ p = buf; while (*p) { diff --git a/pgp.c b/pgp.c index fccf7a9..f584031 100644 --- a/pgp.c +++ b/pgp.c @@ -82,8 +82,8 @@ int pgp_valid_passphrase (void) pgp_void_passphrase (); - if (mutt_get_password - (_("Enter PGP passphrase:"), PgpPass, sizeof (PgpPass)) == 0) { + if (mutt_get_field_unbuffered (_("Enter PGP passphrase:"), PgpPass, + sizeof (PgpPass), M_PASS) == 0) { PgpExptime = time (NULL) + PgpTimeout; return (1); } diff --git a/pop/pop_lib.c b/pop/pop_lib.c index 9e7d4e4..024cbdc 100644 --- a/pop/pop_lib.c +++ b/pop/pop_lib.c @@ -262,7 +262,9 @@ pop_query_status pop_open_connection (POP_DATA * pop_data) #if (defined(USE_SSL) || defined(USE_GNUTLS)) /* Attempt STLS if available and desired. */ - if (pop_data->cmd_stls && !pop_data->conn->ssf) { + if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) { + if (option (OPTSSLFORCETLS)) + pop_data->use_stls = 2; if (pop_data->use_stls == 0) { ret = query_quadoption (OPT_SSLSTARTTLS, _("Secure connection with TLS?")); @@ -303,6 +305,12 @@ pop_query_status pop_open_connection (POP_DATA * pop_data) } } } + + if (option(OPTSSLFORCETLS) && !pop_data->conn->ssf) { + mutt_error _("Encrypted connection unavailable"); + mutt_sleep (1); + return -2; + } #endif ret = pop_authenticate (pop_data); diff --git a/protos.h b/protos.h index 684ffd1..a4d56ef 100644 --- a/protos.h +++ b/protos.h @@ -304,8 +304,8 @@ int _mutt_enter_string (char *, size_t, int, int, int, int, char ***, int *, ENTER_STATE *); #define mutt_get_field(A,B,C,D) _mutt_get_field(A,B,C,D,0,NULL,NULL) int _mutt_get_field (char *, char *, size_t, int, int, char ***, int *); +int mutt_get_field_unbuffered (char *, char *, size_t, int); int mutt_get_hook_type (const char *); -int mutt_get_password (char *, char *, size_t); int mutt_get_postponed (CONTEXT *, HEADER *, HEADER **, char *, size_t); int mutt_get_tmp_attachment (BODY *); int mutt_index_menu (void); diff --git a/sendlib.c b/sendlib.c index c9c5874..226715b 100644 --- a/sendlib.c +++ b/sendlib.c @@ -66,77 +66,6 @@ extern char RFC822Specials[]; -static struct sysexits { - int v; - const char *str; -} sysexits_h[] = { -#ifdef EX_USAGE - { - 0xff & EX_USAGE, "Bad usage."}, -#endif -#ifdef EX_DATAERR - { - 0xff & EX_DATAERR, "Data format error."}, -#endif -#ifdef EX_NOINPUT - { - 0xff & EX_NOINPUT, "Cannot open input."}, -#endif -#ifdef EX_NOUSER - { - 0xff & EX_NOUSER, "User unknown."}, -#endif -#ifdef EX_NOHOST - { - 0xff & EX_NOHOST, "Host unknown."}, -#endif -#ifdef EX_UNAVAILABLE - { - 0xff & EX_UNAVAILABLE, "Service unavailable."}, -#endif -#ifdef EX_SOFTWARE - { - 0xff & EX_SOFTWARE, "Internal error."}, -#endif -#ifdef EX_OSERR - { - 0xff & EX_OSERR, "Operating system error."}, -#endif -#ifdef EX_OSFILE - { - 0xff & EX_OSFILE, "System file missing."}, -#endif -#ifdef EX_CANTCREAT - { - 0xff & EX_CANTCREAT, "Can't create output."}, -#endif -#ifdef EX_IOERR - { - 0xff & EX_IOERR, "I/O error."}, -#endif -#ifdef EX_TEMPFAIL - { - 0xff & EX_TEMPFAIL, "Deferred."}, -#endif -#ifdef EX_PROTOCOL - { - 0xff & EX_PROTOCOL, "Remote protocol error."}, -#endif -#ifdef EX_NOPERM - { - 0xff & EX_NOPERM, "Insufficient permission."}, -#endif -#ifdef EX_CONFIG - { - 0xff & EX_NOPERM, "Local configuration error."}, -#endif - { - S_ERR, "Exec error."}, { - -1, NULL} -}; - - - #define DISPOSITION(X) X==DISPATTACH?"attachment":"inline" const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t"; @@ -2027,19 +1956,6 @@ static char **add_option (char **args, size_t * argslen, size_t * argsmax, return (args); } -static const char *strsysexit (int e) -{ - int i; - - for (i = 0; sysexits_h[i].str; i++) { - if (e == sysexits_h[i].v) - break; - } - - return sysexits_h[i].str; -} - - static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */ ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */ const char *msg, /* file containing message */ @@ -2122,9 +2038,9 @@ static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */ if ((i = send_msg (path, args, msg, &childout)) != (EX_OK & 0xff)) { if (i != S_BKG) { - const char *e = strsysexit (i); + const char *e = mutt_strsysexit (i); - e = strsysexit (i); + e = mutt_strsysexit (i); mutt_error (_("Error sending message, child exited %d (%s)."), i, NONULL (e)); if (childout) { diff --git a/smime.c b/smime.c index 102732f..965f40a 100644 --- a/smime.c +++ b/smime.c @@ -104,8 +104,8 @@ int smime_valid_passphrase (void) smime_void_passphrase (); - if (mutt_get_password - (_("Enter SMIME passphrase:"), SmimePass, sizeof (SmimePass)) == 0) { + if (mutt_get_field_unbuffered (_("Enter SMIME passphrase:"), SmimePass, + sizeof (SmimePass), M_PASS) == 0) { SmimeExptime = time (NULL) + SmimeTimeout; return (1); }