This is essentially the same as id:"1330157204-26094-1-git-send-email-markwalters1009@gmail.com" but has been rebased against master. The changes are to patch 12/13 for notmuch-show.el (which was posted as a followup to the previous series) and to the tests (patch 9/13) which changed in Austin's JSON show rewrite. Best wishes Mark Mark Walters (13): cli: add --no-exclude option to count and search. cli: Add --no-exclude to the man pages for search and count test: add tests for new cli --no-exclude option lib: Rearrange the exclude code in query.cc lib: Make notmuch_query_search_messages set the exclude flag lib: Add the exclude flag to notmuch_query_search_threads test: update search test to reflect exclude flag cli: Make notmuch-show respect excludes. test: update tests to reflect the exclude flag man: update manpage for notmuch-show --no-exclude option cli: omit excluded messages in results where appropriate. emacs: show: recognize the exclude flag. emacs: notmuch.el ignore excluded matches emacs/notmuch-show.el | 36 ++++++++++++++++----- emacs/notmuch.el | 22 +++++++------ lib/notmuch-private.h | 8 +++- lib/notmuch.h | 16 +++++++-- lib/query.cc | 77 +++++++++++++++++++++++++++++++++++++++------ lib/thread.cc | 18 +++++++++-- man/man1/notmuch-count.1 | 7 ++++ man/man1/notmuch-search.1 | 7 ++++ man/man1/notmuch-show.1 | 7 ++++ notmuch-count.c | 19 +++++++--- notmuch-search.c | 26 ++++++++++++--- notmuch-show.c | 31 ++++++++++++++++-- test/count | 21 ++++++++++++ test/crypto | 9 +++++- test/encoding | 2 +- test/json | 6 ++-- test/maildir-sync | 1 + test/multipart | 6 ++-- test/search | 8 ++++- test/thread-naming | 16 +++++----- 20 files changed, 273 insertions(+), 70 deletions(-) -- 1.7.2.3