Merge branch 'release'

diff --combined man/man1/notmuch-config.1
index e62577cc323c32470e7677ce16761c39c1991855,2205d288fcf09667934479ecb0cbf7dccc9859c1..d22988a7f9e5c09950c29d6fe87b73ecdff13a06
--- 1/man/man1/notmuch-config.1
--- 2/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@@ -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
@@@ -137,9 -129,8 +137,8 @@@ Specifies the location of the notmuch c
  use ${HOME}/.notmuch\-config if this variable is not set.
  .SH SEE ALSO
  
- \fBnotmuch\fR(1), \fBnotmuch-count\fR(1),
- \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
- \fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1),
+ \fBnotmuch\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch-dump\fR(1),
+ \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
  \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
  \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
  \fBnotmuch-tag\fR(1)

diff --combined man/man1/notmuch-count.1
index 805a8ae3efe1b25e0b75435d3581a55068e7439e,79dd6a5ba3062efb8118cfe78549edbdec6d2765..f593065a6038bd004f9660a67d445bd7bcba1b1a
--- 1/man/man1/notmuch-count.1
--- 2/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@@ -38,20 -38,13 +38,20 @@@ 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
  
  .SH SEE ALSO
  
  \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-dump\fR(1),
- \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1),
- \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
- \fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7),
- \fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1)
+ \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
+ \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
+ \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
+ \fBnotmuch-tag\fR(1)

diff --combined man/man1/notmuch-search.1
index 8426aa331fd2abe50b93be11cb9e6bc6094b2312,72874d01c278b98d452487f795a75c4fcfe56549..c62ad18511b43eaf2e195fd441e5ccde994da6de
--- 1/man/man1/notmuch-search.1
--- 2/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@@ -112,17 -112,10 +112,17 @@@ 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),
- \fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1),
- \fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1),
- \fBnotmuch-restore\fR(1), \fBnotmuch-search-terms\fR(7),
- \fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1)
+ \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
+ \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
+ \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
+ \fBnotmuch-tag\fR(1)

diff --combined man/man1/notmuch-show.1
index d75d9710da0ade4483b65eda78f47bd4585edcd4,27a06b7aa64a72d750e5cfd816ea3defa4c43522..ebdd189fa0980710990ddd42810ba83a7f7e1061
--- 1/man/man1/notmuch-show.1
--- 2/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@@ -128,13 -128,6 +128,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
@@@ -146,7 -139,7 +146,7 @@@ command
  .SH SEE ALSO
  
  \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
- \fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
- \fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1),
- \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
- \fBnotmuch-search-terms\fR(7), \fBnotmuch-tag\fR(1)
+ \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
+ \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
+ \fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7),
+ \fBnotmuch-tag\fR(1)

diff --combined test/crypto
index 4de4d2bbb4124d2fa4068907a22ebcefd81911bd,6723ef8755f6dcbf6a11aefce900c6cb4b29b6e0..be752b19674cdd174e27cee6ead6a53bc52cc172
--- 1/test/crypto
--- 2/test/crypto
+++ b/test/crypto
@@@ -43,7 -43,6 +43,7 @@@ output=$(notmuch show --format=json --v
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -51,8 -50,9 +51,8 @@@
   "headers": {"Subject": "test signed message 001",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "sigstatus": [{"status": "good",
   "fingerprint": "'$FINGERPRINT'",
@@@ -77,7 -77,6 +77,7 @@@ output=$(notmuch show --format=json --v
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -85,8 -84,9 +85,8 @@@
   "headers": {"Subject": "test signed message 001",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "sigstatus": [{"status": "good",
   "fingerprint": "'$FINGERPRINT'",
@@@ -104,8 -104,6 +104,6 @@@ test_expect_equal 
      "$expected"
  
  test_begin_subtest "signature verification with signer key unavailable"
- # this is broken with current versions of gmime-2.6
- (ldd $(which notmuch) | grep -Fq gmime-2.6) && test_subtest_known_broken
  # move the gnupghome temporarily out of the way
  mv "${GNUPGHOME}"{,.bak}
  output=$(notmuch show --format=json --verify subject:"test signed message 001" \
@@@ -113,7 -111,6 +111,7 @@@
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -121,8 -118,9 +119,8 @@@
   "headers": {"Subject": "test signed message 001",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "sigstatus": [{"status": "error",
   "keyid": "'$(echo $FINGERPRINT | cut -c 25-)'",
@@@ -153,7 -151,7 +151,7 @@@ test_begin_subtest "decryption, --forma
  output=$(notmuch show --format=text --decrypt subject:"test encrypted message 001" \
      | notmuch_show_sanitize_all \
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
 -expected='\fmessage{ id:XXXXX depth:0 match:1 filename:XXXXX
 +expected='\fmessage{ id:XXXXX depth:0 match:1 excluded:0 filename:XXXXX
  \fheader{
  Notmuch Test Suite <test_suite@notmuchmail.org> (2000-01-01) (encrypted inbox)
  Subject: test encrypted message 001
@@@ -187,7 -185,6 +185,7 @@@ output=$(notmuch show --format=json --d
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -195,8 -192,9 +193,8 @@@
   "headers": {"Subject": "test encrypted message 001",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "encstatus": [{"status": "good"}],
   "sigstatus": [],
@@@ -242,7 -240,6 +240,7 @@@ output=$(notmuch show --format=json --d
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -250,8 -247,9 +248,8 @@@
   "headers": {"Subject": "test encrypted message 001",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "encstatus": [{"status": "bad"}],
   "content-type": "multipart/encrypted",
@@@ -277,7 -275,6 +275,7 @@@ output=$(notmuch show --format=json --d
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -285,8 -282,9 +283,8 @@@
   "headers": {"Subject": "test encrypted message 002",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "encstatus": [{"status": "good"}],
   "sigstatus": [{"status": "good",
@@@ -332,7 -330,6 +330,7 @@@ output=$(notmuch show --format=json --v
      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
  expected='[[[{"id": "XXXXX",
   "match": true,
 + "excluded": false,
   "filename": "YYYYY",
   "timestamp": 946728000,
   "date_relative": "2000-01-01",
@@@ -340,8 -337,9 +338,8 @@@
   "headers": {"Subject": "test signed message 001",
   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
   "To": "test_suite@notmuchmail.org",
 - "Cc": "",
 - "Bcc": "",
 - "Date": "01 Jan 2000 12:00:00 -0000"},
 + "Date": "Sat,
 + 01 Jan 2000 12:00:00 +0000"},
   "body": [{"id": 1,
   "sigstatus": [{"status": "error",
   "keyid": "6D92612D94E46381",