From: pdmef Date: Fri, 6 May 2005 18:59:27 +0000 (+0000) Subject: Rocco Rutte: X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=9d2f1c9b6d2984bb6ee3e0a6c1709a678a801776 Rocco Rutte: - fix bug #3964 - clarify documentation about $msgid_format and $hostname git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@287 e385b8ad-14ed-0310-8656-cc95a2468c6d --- diff --git a/doc/manual.txt b/doc/manual.txt index c127ae9..bef333f 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -4665,8 +4665,11 @@ Default: '' - Specifies the hostname to use after the ``@'' in local e-mail addresses. This - overrides the compile time definition obtained from /etc/resolv.conf. + Specifies the hostname to use after the ``@'' in local e-mail addresses and + during generation of Message-Id: headers. + + Please be sure to really know what you are doing when changing this variable to + configure a custom domain part of Message-IDs. _6_._3_._9_3 _i_g_n_o_r_e___l_i_s_t___r_e_p_l_y___t_o @@ -4678,12 +4681,13 @@ mailing lists. When _s_e_t, if the ``Reply-To:'' header field is set to the same value as the ``To:'' header field, Mutt-ng assumes that the ``Reply-To:'' header field was set by the mailing list to automate responses to the list, and + + The Mutt-ng E-Mail Client 87 + will ignore this field. To direct a response to the mailing list when this option is set, use the _l_i_s_t_-_r_e_p_l_y function; _g_r_o_u_p_-_r_e_p_l_y will reply to both the sender and the list. - The Mutt-ng E-Mail Client 87 - _6_._3_._9_4 _i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s Type: string @@ -4734,12 +4738,12 @@ Type: string + The Mutt-ng E-Mail Client 88 + Default: '' Availability: IMAP - The Mutt-ng E-Mail Client 88 - Mutt-ng requests these header fields in addition to the default headers (``DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN- REPLY-TO REPLY-TO LINES X-LABEL'') from IMAP servers before displaying the @@ -4790,12 +4794,12 @@ 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. + The Mutt-ng E-Mail Client 89 + _6_._3_._1_0_1 _i_m_a_p___m_a_i_l___c_h_e_c_k Type: number - The Mutt-ng E-Mail Client 89 - Default: 5 This variable configures how often (in seconds) Mutt-ng should look for new @@ -4847,12 +4851,12 @@ closing an IMAP folder somewhat slower. This option exists to appease speed freaks. + The Mutt-ng E-Mail Client 90 + _6_._3_._1_0_5 _i_m_a_p___r_e_c_o_n_n_e_c_t Type: quadoption - The Mutt-ng E-Mail Client 90 - Default: ask-yes Availability: IMAP @@ -4903,12 +4907,13 @@ Default: ask-yes Controls whether or not a copy of the message(s) you are replying to is + + The Mutt-ng E-Mail Client 91 + included in your reply. _6_._3_._1_1_0 _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t - The Mutt-ng E-Mail Client 91 - Type: boolean Default: no @@ -4958,12 +4963,12 @@ %C current message number + The Mutt-ng E-Mail Client 92 + %d date and time of the message in the format specified by ``date_for- mat'' converted to sender's time zone - The Mutt-ng E-Mail Client 92 - %D date and time of the message in the format specified by ``date_for- mat'' converted to the local time zone @@ -5014,11 +5019,11 @@ (_O_riginal save folder) Where Mutt-ng would formerly have stashed the message: list name or recipient name if no list + The Mutt-ng E-Mail Client 93 + %s subject of the message - The Mutt-ng E-Mail Client 93 - %S status of the message (N/D/d/!/r/*) @@ -5069,11 +5074,11 @@ the current local time. ``fmt'' is expanded by the library function ``strftime''; a leading bang disables locales. + The Mutt-ng E-Mail Client 94 + %>X right justify the rest of the string and pad with character 'X' - The Mutt-ng E-Mail Client 94 - %|X pad to the end of the line with character 'X' @@ -5123,12 +5128,12 @@ (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. + The Mutt-ng E-Mail Client 95 + _6_._3_._1_1_7 _l_o_c_a_l_e Type: string - The Mutt-ng E-Mail Client 95 - Default: 'C' The locale used by strftime(3) to format dates. Legal values are the strings @@ -5179,12 +5184,12 @@ files when the header cache is in use. This incurs one stat(2) per message every time the folder is opened. + The Mutt-ng E-Mail Client 96 + _6_._3_._1_2_2 _m_a_i_l_d_i_r___t_r_a_s_h Type: boolean - The Mutt-ng E-Mail Client 96 - Default: no If _s_e_t, messages marked as deleted will be saved with the maildir (T)rashed @@ -5235,12 +5240,13 @@ Default: 0 When _s_e_t, the maximum line length for displaying ``format = flowed'' messages + + The Mutt-ng E-Mail Client 97 + is limited to this length. A value of 0 (which is also the default) means that the maximum line length is determined by the terminal width and _$_w_r_a_p_m_a_r_g_i_n (section 6.3.328 , page 145). - The Mutt-ng E-Mail Client 97 - _6_._3_._1_2_7 _m_b_o_x Type: path @@ -5290,14 +5296,14 @@ vious page of the menu is displayed (useful for slow links to avoid many redraws). + The Mutt-ng E-Mail Client 98 + _6_._3_._1_3_2 _m_e_s_s_a_g_e___f_o_r_m_a_t Type: string Default: '%s' - The Mutt-ng E-Mail Client 98 - This is the string displayed in the ``attachment'' menu for attachments of type 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.3.112 , page 91)''. @@ -5346,14 +5352,14 @@ Type: string + The Mutt-ng E-Mail Client 99 + Default: 'replied' The name of the MH sequence used to tag replied messages. _6_._3_._1_3_8 _m_h___s_e_q___u_n_s_e_e_n - The Mutt-ng E-Mail Client 99 - Type: string Default: 'unseen' @@ -5402,6 +5408,8 @@ Default: yes + The Mutt-ng E-Mail Client 100 + Availability: NNTP If _u_n_s_e_t, an 8-bit ``Subject:'' header field in a news article will not be @@ -5409,8 +5417,6 @@ NNoottee:: Only change this setting if you know what you are doing. - The Mutt-ng E-Mail Client 100 - _6_._3_._1_4_3 _m_i_x___e_n_t_r_y___f_o_r_m_a_t Type: string @@ -5458,6 +5464,8 @@ _6_._3_._1_4_6 _m_s_g_i_d___f_o_r_m_a_t + The Mutt-ng E-Mail Client 101 + Type: string Default: '%Y%m%d%h%M%s.G%P%p' @@ -5465,9 +5473,6 @@ This is the format for the ``local part'' of the Message-Id: header field gen- erated by Mutt-ng. The format string contains of one or more characters. The '%' character marks that certain data will be added to the string, similar to - - The Mutt-ng E-Mail Client 101 - printf(3). The following characters are allowed: %d @@ -5516,14 +5521,14 @@ 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. + The Mutt-ng E-Mail Client 102 + _6_._3_._1_4_7 _n_a_r_r_o_w___t_r_e_e Type: boolean Default: no - The Mutt-ng E-Mail Client 102 - This variable, when _s_e_t, makes the thread tree narrower, allowing deeper threads to fit on the screen. @@ -5572,14 +5577,14 @@ Availability: NNTP + The Mutt-ng E-Mail Client 103 + This file contains information about subscribed newsgroup and articles read so far. To ease the use of multiple news servers, the following printf(3)-style sequence is understood: - The Mutt-ng E-Mail Client 103 - %s newsserver name _6_._3_._1_5_1 _n_n_t_p___c_o_n_t_e_x_t @@ -5627,14 +5632,14 @@ Default: 60 + The Mutt-ng E-Mail Client 104 + Availability: NNTP The time in seconds until any operations on a newsgroup except posting a new article will cause a recheck for new news. If set to 0, Mutt-ng will recheck on each operation in index (stepping, read article, etc.). - The Mutt-ng E-Mail Client 104 - _6_._3_._1_5_5 _n_n_t_p___r_e_c_o_n_n_e_c_t Type: quadoption @@ -5684,14 +5689,14 @@ screen resizes cause lines longer than the screen width to be badly formatted in the help menu. + The Mutt-ng E-Mail Client 105 + _6_._3_._1_5_9 _p_a_g_e_r___c_o_n_t_e_x_t Type: number Default: 0 - The Mutt-ng E-Mail Client 105 - This variable controls the number of lines of context that are given when dis- playing the next or previous page in the internal pager. By default, Mutt-ng will display the line after the last one on the screen at the top of the next @@ -5740,6 +5745,8 @@ Default: no + The Mutt-ng E-Mail Client 106 + If _s_e_t, Mutt-ng will automatically attempt to decrypt traditional PGP messages whenever the user performs an operation which ordinarily would result in the contents of the message being operated on. For example, if the user displays a @@ -5747,8 +5754,6 @@ ditional-pgp function, Mutt-ng will automatically check the message for tradi- tional pgp. - The Mutt-ng E-Mail Client 106 - _6_._3_._1_6_4 _p_g_p___a_u_t_o_i_n_l_i_n_e Type: boolean @@ -5797,6 +5802,8 @@ The PGP command formats have their own set of printf(3)-like sequences: + The Mutt-ng E-Mail Client 107 + %p Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty string otherwise. Note: This may be used with a %? construct. @@ -5804,8 +5811,6 @@ %f Expands to the name of a file containing a message. - The Mutt-ng E-Mail Client 107 - %s Expands to the name of a file containing the signature part of a multipart/signed attachment when verifying it. @@ -5853,6 +5858,9 @@ 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.3.112 , page + + The Mutt-ng E-Mail Client 108 + 91)'', but has its own set of printf(3)-like sequences: %n @@ -5861,8 +5869,6 @@ %k key id - The Mutt-ng E-Mail Client 108 - %u user id @@ -5910,6 +5916,8 @@ Default: '' + The Mutt-ng E-Mail Client 109 + 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.3.190 , page 112) contains the text. Use this variable if the exit code from the command is 0 @@ -5917,8 +5925,6 @@ _6_._3_._1_7_5 _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s - The Mutt-ng E-Mail Client 109 - Type: boolean Default: yes @@ -5966,6 +5972,8 @@ Default: no + The Mutt-ng E-Mail Client 110 + If _s_e_t, use 64 bit PGP key IDs. _U_n_s_e_t uses the normal 32 bit Key IDs. (PGP only) @@ -5973,8 +5981,6 @@ Type: quadoption - The Mutt-ng E-Mail Client 110 - Default: ask-yes This option controls whether Mutt-ng will prompt you for automatically sending @@ -6022,14 +6028,14 @@ Type: boolean + The Mutt-ng E-Mail Client 111 + Default: yes If _s_e_t, Mutt-ng will display non-usable keys on the PGP key selection menu. This includes keys which have been revoked, have expired, or have been marked as ``disabled'' by the user. (PGP only) - The Mutt-ng E-Mail Client 111 - _6_._3_._1_8_4 _p_g_p___s_i_g_n___a_s Type: string @@ -6079,13 +6085,13 @@ Default: yes + The Mutt-ng E-Mail Client 112 + If _s_e_t, Mutt-ng will automatically encode PGP/MIME signed messages as quoted- printable. Please note that unsetting this variable may lead to problems with non-verifyable PGP signatures, so only change this if you know what you are doing. (PGP only) - The Mutt-ng E-Mail Client 112 - _6_._3_._1_8_8 _p_g_p___t_i_m_e_o_u_t Type: number @@ -6136,11 +6142,11 @@ Default: '\n' + The Mutt-ng E-Mail Client 113 + The separator to add between messages when piping a list of tagged messages to an external Unix command. - The Mutt-ng E-Mail Client 113 - _6_._3_._1_9_4 _p_i_p_e___s_p_l_i_t Type: boolean @@ -6192,12 +6198,12 @@ Default: 60 + The Mutt-ng E-Mail Client 114 + Availability: POP This variable configures how often (in seconds) POP should look for new mail. - The Mutt-ng E-Mail Client 114 - _6_._3_._1_9_8 _p_o_p___d_e_l_e_t_e Type: quadoption @@ -6249,11 +6255,11 @@ Specifies the password for your POP account. If _u_n_s_e_t, Mutt-ng will prompt you for your password when you open POP mailbox. + The Mutt-ng E-Mail Client 115 + 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. - The Mutt-ng E-Mail Client 115 - _6_._3_._2_0_2 _p_o_p___r_e_c_o_n_n_e_c_t Type: quadoption @@ -6305,12 +6311,11 @@ Type: quadoption + The Mutt-ng E-Mail Client 116 + Default: ask-yes Controls whether or not messages are saved in the ``_$_p_o_s_t_p_o_n_e_d (section - - The Mutt-ng E-Mail Client 116 - 6.3.207 , page 115)'' mailbox when you elect not to send immediately. _6_._3_._2_0_7 _p_o_s_t_p_o_n_e_d @@ -6362,12 +6367,12 @@ _6_._3_._2_1_1 _p_r_i_n_t___d_e_c_o_d_e + The Mutt-ng E-Mail Client 117 + Type: boolean Default: yes - The Mutt-ng E-Mail Client 117 - 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.3.210 , page 116). If this option is _u_n_s_e_t, no pro- @@ -6419,12 +6424,11 @@ Default: yes + The Mutt-ng E-Mail Client 118 + This variable controls whether ``quit'' and ``exit'' actually quit from Mutt- ng. If it set to _y_e_s, they do quit, if it is set to _n_o, they have no effect, and if it is set to _a_s_k_-_y_e_s or _a_s_k_-_n_o, you are prompted for confirmation when - - The Mutt-ng E-Mail Client 118 - you try to quit. _6_._3_._2_1_6 _q_u_o_t_e___e_m_p_t_y @@ -6475,12 +6479,12 @@ Also see the ``_$_w_r_i_t_e___i_n_c (section 6.3.330 , page 145)'' variable. + The Mutt-ng E-Mail Client 119 + _6_._3_._2_2_0 _r_e_a_d___o_n_l_y Type: boolean - The Mutt-ng E-Mail Client 119 - Default: no If set, all folders are opened in read-only mode. @@ -6532,12 +6536,12 @@ Default: '^(re([\[0-9\]+])*|aw):[ \t]*' + The Mutt-ng E-Mail Client 120 + A regular expression used to recognize reply messages when threading and reply- ing. The default value corresponds to the English ``Re:'' and the German ``Aw:''. - The Mutt-ng E-Mail Client 120 - _6_._3_._2_2_5 _r_e_p_l_y___s_e_l_f Type: boolean @@ -6588,12 +6592,12 @@ From: abd30425@somewhere.net + The Mutt-ng E-Mail Client 121 + It would be displayed in the index menu as ``Joe User'' instead of ``abd30425@somewhere.net.'' This is useful when the person's e-mail address is not human friendly (like CompuServe addresses). - The Mutt-ng E-Mail Client 121 - _6_._3_._2_2_9 _r_e_v_e_r_s_e___n_a_m_e Type: boolean @@ -6644,12 +6648,12 @@ _6_._3_._2_3_2 _s_a_v_e___a_d_d_r_e_s_s + The Mutt-ng E-Mail Client 122 + Type: boolean Default: no - The Mutt-ng E-Mail Client 122 - 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.3.234 , page 122)'' or ``_$_f_o_r_c_e___n_a_m_e (section 6.3.70 , page 81)'' is _s_e_t too, the selection of the @@ -6700,12 +6704,12 @@ Default: yes + The Mutt-ng E-Mail Client 123 + 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.3.237 , page 122)'' variable and friends are used. - The Mutt-ng E-Mail Client 123 - _6_._3_._2_3_7 _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e Type: number @@ -6756,12 +6760,12 @@ Default: '/usr/sbin/sendmail -oem -oi' + The Mutt-ng E-Mail Client 124 + Specifies the program and arguments used to deliver mail sent by Mutt-ng. Mutt-ng expects that the specified program interprets additional arguments as recipient addresses. - The Mutt-ng E-Mail Client 124 - _6_._3_._2_4_2 _s_e_n_d_m_a_i_l___w_a_i_t Type: number @@ -6813,12 +6817,12 @@ Type: boolean + The Mutt-ng E-Mail Client 125 + Default: no Availability: NNTP - The Mutt-ng E-Mail Client 125 - If _s_e_t, only subscribed newsgroups that contain unread articles will be dis- played in the newsgroup browser. @@ -6868,13 +6872,13 @@ %f Number of flagged messages. + The Mutt-ng E-Mail Client 126 + %n Number of new messages. The %f and %n expandos may optionally be printed non-zero. - The Mutt-ng E-Mail Client 126 - _6_._3_._2_5_0 _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 @@ -6923,14 +6927,14 @@ For example, Mutt-ng has the ability to highlight the signature in a different color in the builtin pager. + The Mutt-ng E-Mail Client 127 + _6_._3_._2_5_4 _s_i_g___o_n___t_o_p Type: boolean Default: no - The Mutt-ng E-Mail Client 127 - 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 @@ -6979,6 +6983,8 @@ Type: number + The Mutt-ng E-Mail Client 128 + Default: 1 Specifies time, in seconds, to pause while displaying certain informational @@ -6986,8 +6992,6 @@ the current folder. The default is to pause one second, so a value of zero for this option suppresses the pause. - The Mutt-ng E-Mail Client 128 - _6_._3_._2_5_9 _s_m_a_r_t___w_r_a_p Type: boolean @@ -7035,14 +7039,15 @@ Default: '' Since there is no pubring/secring as with PGP, Mutt-ng has to handle storage + + The Mutt-ng E-Mail Client 129 + and retrieval of keys by itself. This is very basic right now, and keys and certificates are stored in two different directories, both named as the hash- value retrieved from OpenSSL. There is an index file which contains mailbox- address keyid pairs, and which can be manually edited. This one points to the location of the certificates. (S/MIME only) - The Mutt-ng E-Mail Client 129 - _6_._3_._2_6_4 _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d Type: string @@ -7091,14 +7096,15 @@ 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, + + The Mutt-ng E-Mail Client 130 + if it can't find one. (S/MIME only) _6_._3_._2_6_6 _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y Type: string - The Mutt-ng E-Mail Client 130 - Default: '' This is the default key-pair to use for signing. This must be set to the keyid @@ -7148,12 +7154,12 @@ Default: '' + The Mutt-ng E-Mail Client 131 + This command is used to extract only the signers X509 certificate from a S/MIME signature, so that the certificate's owner may get compared to the email's ``From:'' header field. (S/MIME only) - The Mutt-ng E-Mail Client 131 - _6_._3_._2_7_2 _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d Type: string @@ -7205,11 +7211,11 @@ Default: '' + The Mutt-ng E-Mail Client 132 + This command is used to created S/MIME signatures of type multipart/signed, which can be read by all mail clients. (S/MIME only) - The Mutt-ng E-Mail Client 132 - _6_._3_._2_7_7 _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d Type: string @@ -7262,10 +7268,10 @@ 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_._3_._2_8_2 _s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e - The Mutt-ng E-Mail Client 133 + _6_._3_._2_8_2 _s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e + Type: string Default: '' @@ -7309,6 +7315,8 @@ Specifies how to sort messages in the _i_n_d_e_x menu. Valid values are: + The Mutt-ng E-Mail Client 134 + date or date-sent date-received from @@ -7320,8 +7328,6 @@ threads to - The Mutt-ng E-Mail Client 134 - You may optionally use the ``reverse-'' prefix to specify reverse sorting order (example: set sort=reverse-date-sent). @@ -7361,6 +7367,8 @@ (section 6.3.287 , page 134) is reversed again (which is not the right thing to do, but kept to not break any existing configuration setting). + The Mutt-ng E-Mail Client 135 + _6_._3_._2_8_8 _s_o_r_t___b_r_o_w_s_e_r Type: sort order @@ -7373,9 +7381,6 @@ alpha (alphabetically) date size - - The Mutt-ng E-Mail Client 135 - unsorted You may optionally use the ``reverse-'' prefix to specify reverse sorting order @@ -7416,6 +7421,9 @@ Default: '' If your spool mailbox is in a non-default place where Mutt-ng cannot find it, + + The Mutt-ng E-Mail Client 136 + 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. @@ -7430,8 +7438,6 @@ certificate that is signed with one of these CA certificates are also automati- cally accepted. - The Mutt-ng E-Mail Client 136 - Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt _6_._3_._2_9_3 _s_s_l___c_l_i_e_n_t___c_e_r_t @@ -7472,6 +7478,8 @@ Type: boolean + The Mutt-ng E-Mail Client 137 + Default: yes Availability: SSL or NSS or GNUTLS @@ -7487,8 +7495,6 @@ Availability: SSL or NSS or GNUTLS - The Mutt-ng E-Mail Client 137 - This variables specifies whether to attempt to use TLSv1 in the SSL authentica- tion process. @@ -7529,6 +7535,8 @@ %d number of deleted messages * + The Mutt-ng E-Mail Client 138 + %f the full pathname of the current mailbox @@ -7542,11 +7550,8 @@ size (in bytes) of the current mailbox * %L - size (in bytes) of the messages shown (i.e., which match the - - The Mutt-ng E-Mail Client 138 - - current limit) * + size (in bytes) of the messages shown (i.e., which match the cur- + rent limit) * %m the number of messages in the mailbox * @@ -7587,6 +7592,8 @@ %v Mutt-ng version string + The Mutt-ng E-Mail Client 139 + %V currently active limit pattern, if any * @@ -7600,9 +7607,6 @@ Some of the above sequences can be used to optionally print a string if their value is nonzero. For example, you may only want to see the number of flagged - - The Mutt-ng E-Mail Client 139 - messages if such messages exist, since zero is not particularly meaningful. To optionally print a string based upon one of the above sequences, the following construct is used @@ -7644,6 +7648,8 @@ Setting this variable causes the ``status bar'' to be displayed on the first line of the screen rather than near the bottom. + The Mutt-ng E-Mail Client 140 + _6_._3_._3_0_1 _s_t_r_i_c_t___m_i_m_e Type: boolean @@ -7657,9 +7663,6 @@ This option also replaces linear-white-space between encoded-word and *text to a single space to prevent the display of MIME-encoded ``Subject:'' header field - - The Mutt-ng E-Mail Client 140 - from being devided into multiple lines. _6_._3_._3_0_2 _s_t_r_i_c_t___t_h_r_e_a_d_s @@ -7702,6 +7705,8 @@ Default: no + The Mutt-ng E-Mail Client 141 + If _s_e_t, attachments with flowed format will have their quoting ``stuffed'', i.e. a space will be inserted between the quote characters and the actual text. @@ -7715,8 +7720,6 @@ usually CTRL+Z. This is useful if you run Mutt-ng inside an xterm using a com- mand like ``xterm -e muttng.'' - The Mutt-ng E-Mail Client 141 - _6_._3_._3_0_7 _t_e_x_t___f_l_o_w_e_d Type: boolean @@ -7758,6 +7761,9 @@ Default: no When _s_e_t, the internal-pager will pad blank lines to the bottom of the screen + + The Mutt-ng E-Mail Client 142 + with a tilde (~). _6_._3_._3_1_1 _t_i_m_e_o_u_t @@ -7770,8 +7776,6 @@ pressed in the main menu before timing out and checking for new mail. A value of zero or less will cause Mutt-ng to never time out. - The Mutt-ng E-Mail Client 142 - _6_._3_._3_1_2 _t_m_p_d_i_r Type: path @@ -7815,6 +7819,8 @@ Type: string + The Mutt-ng E-Mail Client 143 + Default: '' Setting this variable will cause Mutt-ng to open a pipe to a command instead of @@ -7826,8 +7832,6 @@ NNoottee:: For this example to work you must be able to log in to the remote machine without having to enter a password. - The Mutt-ng E-Mail Client 143 - _6_._3_._3_1_6 _u_m_a_s_k Type: number @@ -7871,6 +7875,8 @@ _6_._3_._3_2_0 _u_s_e___f_r_o_m + The Mutt-ng E-Mail Client 144 + Type: boolean Default: yes @@ -7883,8 +7889,6 @@ Type: boolean - The Mutt-ng E-Mail Client 144 - Default: yes Availability: IDN @@ -7928,6 +7932,8 @@ Default: yes + The Mutt-ng E-Mail Client 145 + Controls whether Mutt-ng will ask you to press a key after _s_h_e_l_l_- _e_s_c_a_p_e, _p_i_p_e_- _m_e_s_s_a_g_e, _p_i_p_e_-_e_n_t_r_y, _p_r_i_n_t_-_m_e_s_s_a_g_e, and _p_r_i_n_t_-_e_n_t_r_y commands. @@ -7938,8 +7944,6 @@ When _s_e_t, Mutt-ng will always ask for a key. When _u_n_s_e_t, Mutt-ng will wait for a key only if the external command returned a non-zero status. - The Mutt-ng E-Mail Client 145 - _6_._3_._3_2_6 _w_e_e_d Type: boolean @@ -7984,6 +7988,8 @@ Default: 10 + The Mutt-ng E-Mail Client 146 + When writing a mailbox, a message will be printed every _w_r_i_t_e___i_n_c messages to indicate progress. If set to 0, only a single message will be displayed before writing a mailbox. @@ -7994,8 +8000,6 @@ Type: boolean - The Mutt-ng E-Mail Client 146 - Default: no Availability: NNTP @@ -8041,6 +8045,8 @@ what the function does. The key bindings of these functions can be changed with the _b_i_n_d (section 3.3 , page 17) command. + The Mutt-ng E-Mail Client 147 + _6_._4_._1 _g_e_n_e_r_i_c The _g_e_n_e_r_i_c menu is not a real menu, but specifies common functions (such as @@ -8048,8 +8054,6 @@ tings for this menu will affect the default bindings for all menus (except as noted). - The Mutt-ng E-Mail Client 147 - bottom-page L move to the bottom of the page current-bottom not bound move current entry to bottom of page current-middle not bound move current entry to middle of page diff --git a/init.h b/init.h index fc547b7..494616b 100644 --- a/init.h +++ b/init.h @@ -885,8 +885,10 @@ struct option_t MuttVars[] = { /* ** .pp ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail - ** addresses. This overrides the compile time definition obtained from - ** \fT/etc/resolv.conf\fP. + ** addresses and during generation of \fTMessage-Id:\fP headers. + ** .pp + ** Please be sure to really know what you are doing when changing this variable + ** to configure a custom domain part of Message-IDs. */ {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, 0}, /* @@ -1563,8 +1565,8 @@ struct option_t MuttVars[] = { /* ** .pp ** This is the format for the ``local part'' of the \fTMessage-Id:\fP header - ** field generated - ** by Mutt-ng. The format string contains of one or more characters. The '%' + ** field generated by Mutt-ng. If this variable is empty, no \fTMessage-Id:\fP + ** headers will be generated. The '%' ** character marks that certain data will be added to the string, similar to ** \fTprintf(3)\fP. The following characters are allowed: ** .pp diff --git a/sendlib.c b/sendlib.c index 12f8df5..cade3dc 100644 --- a/sendlib.c +++ b/sendlib.c @@ -1840,12 +1840,8 @@ char *mutt_gen_msgid (void) char buf[SHORT_STRING]; char localpart[SHORT_STRING]; unsigned int localpart_length; - time_t now; - struct tm *tm; const char *fqdn; - now = time (NULL); - tm = gmtime (&now); if (!(fqdn = mutt_fqdn (0))) fqdn = NONULL (Hostname); @@ -2246,7 +2242,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final) mutt_set_followup_to (env); - if (!env->message_id) + if (!env->message_id && MsgIdFormat && *MsgIdFormat) env->message_id = mutt_gen_msgid (); } @@ -2321,7 +2317,8 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to, fseek (fp, h->offset, 0); fprintf (f, "Resent-From: %s", resent_from); fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof (date))); - fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid ()); + if (MsgIdFormat && *MsgIdFormat) + fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid ()); fputs ("Resent-To: ", f); mutt_write_address_list (to, f, 11, 0); mutt_copy_header (fp, h, f, ch_flags, NULL);