From: David Bremner Date: Tue, 20 Mar 2012 01:48:24 +0000 (-0300) Subject: Merge branch 'release' X-Git-Tag: 0.13_rc1~127 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2ee1d8e1c70ce20728bc3faada389a4802636352;hp=-c Merge branch 'release' Conflicts: NEWS Conflicts resolved by hand for date of 0.12 release. --- 2ee1d8e1c70ce20728bc3faada389a4802636352 diff --combined NEWS index 5cfe2220,5c547358..631cf1d5 --- a/NEWS +++ b/NEWS @@@ -1,58 -1,4 +1,58 @@@ +Notmuch 0.13 (2012-xx-xx) +========================= + +Command-Line Interface +---------------------- + +Reply to sender + + "notmuch reply" has gained the ability to create a reply template + for replying just to the sender of the message, in addition to reply + to all. The feature is available through the new command line option + --reply-to=(all|sender). + +JSON reply format + + "notmuch reply" can now produce JSON output that contains the headers + for a reply message and full information about the original message + begin replied to. This allows MUAs to create replies intelligtently. + For example, an MUA that can parse HTML might quote HTML parts. + + Calling notmuch reply with --format=json imposes the restriction that + only a single message is returned by the search, as replying to + multiple messages does not have a well-defined behavior. The default + retains its current behavior for multiple message replies. + +Tag exclusion + + Tags can be automatically excluded from search results by adding them + to the new 'search.exclude_tags' option in the Notmuch config file. + + This behaviour can be overridden by explicitly including an excluded + tag in your query, for example: + + notmuch search $your_query and tag:$excluded_tag + + Existing users will probably want to run "notmuch setup" again to add + the new well-commented [search] section to the configuration file. + + For new configurations, accepting the default setting will cause the + tags "deleted" and "spam" to be excluded, equivalent to running: + + notmuch config set search.exclude_tags deleted spam + +Emacs Interface +--------------- + +Reply improvement using the JSON format + + Emacs now uses the JSON reply format to create replies. It obeys + the customization variables message-citation-line-format and + message-citation-line-function when creating the first line of the + reply body, and it will quote HTML parts if no text/plain parts are + available. + - Notmuch 0.12 (2012-xx-xx) + Notmuch 0.12 (2012-03-20) ========================= Command-Line Interface @@@ -74,6 -20,12 +74,12 @@@ Mail store folder/file ignor NOTE: *Every* file/directory that goes by one of those names will be ignored, independent of its depth/location in the mail store. + Unified help and manual pages + + The notmuch help command now runs man for the appropriate page. If + you install notmuch somewhere "unusual", you may need to update + MANPATH. + Manual page for notmuch configuration options The notmuch CLI configuration file options are now documented in the @@@ -188,8 -140,10 +194,10 @@@ Build fixe Compatibility with GMime 2.6 It is now possible to build notmuch against both GMime 2.4 and 2.6. - However, a bug in current GMime 2.6 causes notmuch not to report - signatures where the signer key is unavailable (GNOME bug 668085). + However, a bug in GMime 2.6 before 2.6.5 causes notmuch not to + report signatures where the signer key is unavailable (GNOME bug + 668085). For compatibility with GMime 2.4's tolerance of "From " + headers we require GMime 2.6 >= 2.6.7. Notmuch 0.11.1 (2012-02-03) =========================== diff --combined man/man1/notmuch-config.1 index a8c17d81,a7468950..395cb9c4 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@@ -1,4 -1,4 +1,4 @@@ - .TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2" + .TH NOTMUCH-CONFIG 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS @@@ -83,14 -83,6 +83,14 @@@ will be ignored, regardless of the loca directory hierarchy. .RE +.RS 4 +.TP 4 +.B search.exclude_tags +A list of tags that will be excluded from search results by +default. Using an excluded tag in a query will override that +exclusion. +.RE + .RS 4 .TP 4 .B maildir.synchronize_flags diff --combined man/man1/notmuch-count.1 index 302a7fa7,8de43453..35ecc532 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@@ -1,4 -1,4 +1,4 @@@ - .TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2" + .TH NOTMUCH-COUNT 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS @@@ -38,13 -38,6 +38,13 @@@ Output the number of matching messages Output the number of matching threads. .RE .RE + +.RS 4 +.TP 4 +.BR \-\-no\-exclude + +Do not exclude the messages matching search.exclude_tags in the config file. +.RE .RE .RE diff --combined man/man1/notmuch-reply.1 index 7ee3cebc,bd95b5f8..8666549b --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@@ -1,4 -1,4 +1,4 @@@ - .TH NOTMUCH-REPLY 1 2012-03-18 "Notmuch 0.12~rc2" + .TH NOTMUCH-REPLY 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. @@@ -37,17 -37,12 +37,17 @@@ Supported options fo include .RS .TP 4 -.BR \-\-format= ( default | headers\-only ) +.BR \-\-format= ( default | json | headers\-only ) .RS .TP 4 .BR default Includes subject and quoted message body. .TP +.BR json +Produces JSON output containing headers for a reply message and the +contents of the original message. This output can be used by a client +to create a reply message intelligently. +.TP .BR headers\-only Only produces In\-Reply\-To, References, To, Cc, and Bcc headers. .RE @@@ -68,16 -63,6 +68,16 @@@ values from the first that contains som user's addresses. .RE .RE +.RS +.TP 4 +.B \-\-decrypt + +Decrypt any MIME encrypted parts found in the selected content +(ie. "multipart/encrypted" parts). Status of the decryption will be +reported (currently only supported with --format=json) and the +multipart/encrypted part will be replaced by the decrypted +content. +.RE See \fBnotmuch-search-terms\fR(7) for details of the supported syntax for . @@@ -88,8 -73,7 +88,8 @@@ with a search string matching a single id:), but it can be useful to reply to several messages at once. For example, when a series of patches are sent in a single thread, replying to the entire thread allows for the reply to comment -on issue found in multiple patches. +on issues found in multiple patches. The default format supports +replying to multiple messages at once, but the JSON format does not. .RE .RE diff --combined man/man1/notmuch-search.1 index 1b0c415f,bf172207..06d81a6f --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@@ -1,4 -1,4 +1,4 @@@ - .TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2" + .TH NOTMUCH-SEARCH 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS @@@ -112,13 -112,6 +112,13 @@@ result from the end Limit the number of displayed results to N. .RE +.RS 4 +.TP 4 +.BR \-\-no\-exclude + +Do not exclude the messages matching search.exclude_tags in the config file. +.RE + .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), diff --combined man/man1/notmuch-show.1 index 1215f919,d69834a1..b81cce69 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@@ -1,4 -1,4 +1,4 @@@ - .TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2" + .TH NOTMUCH-SHOW 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS @@@ -84,17 -84,12 +84,17 @@@ http://homepage.ntlworld.com/jonathan.d .TP 4 .BR raw " (default for a single part, see \-\-part)" -For a message, the original, raw content of the email message is -output. Consumers of this format should expect to implement MIME -decoding and similar functions. +For a message or an attached message part, the original, raw content +of the email message is output. Consumers of this format should expect +to implement MIME decoding and similar functions. For a single part (\-\-part) the raw part content is output after -performing any necessary MIME decoding. +performing any necessary MIME decoding. Note that messages with a +simple body still have two parts: part 0 is the whole message and part +1 is the body. + +For a multipart part, the part headers and body (including all child +parts) is output. The raw format must only be used with search terms matching single message. @@@ -133,13 -128,6 +133,13 @@@ multipart/encrypted part will be replac content. .RE +.RS 4 +.TP 4 +.B \-\-no-exclude + +Do not exclude the messages matching search.exclude_tags in the config file. +.RE + A common use of .B notmuch show is to display a single thread of email messages. For this, use a