This is the latest version of the patch series (previous version at [1]). I think this version fixes all the problems raised by Austin in his review. In particular it rephrases the documentation comment for notmuch_query_set_omit_excluded_messages in notmuch.h, and renames the function to notmuch_query_set_omit_excluded. Corrects the comments and the warning message in notmuch-search.c Modifies the generate_thread function in the search-excludes test. This function now sets gen_thread_id to the id of the generated threads and populates an array gen_thread_msg_id with the message ids of the the messages in the threads. It also slightly changes the subjects to "subject: top message" and "subject: reply n" where n is the depth in the thread. The last of these should be checked as I am not very familiar with bash quoting so could easily have omitted needed quotes. Best wishes Mark [1] id:"1333234442-28616-1-git-send-email-markwalters1009@gmail.com" Mark Walters (6): lib: change default for notmuch_query_set_omit_excluded cli: move count to the new --exclude=(true|false|flag) naming scheme. cli: move search to the new --exclude= naming scheme. test: add some exclude tests cli: move show to the new --exclude= option naming scheme. emacs: make show set --exclude=false emacs/notmuch-show.el | 6 +- lib/notmuch.h | 23 ++++- lib/query.cc | 10 +- man/man1/notmuch-count.1 | 5 +- man/man1/notmuch-search.1 | 12 ++- man/man1/notmuch-show.1 | 16 +++- notmuch-client.h | 1 + notmuch-count.c | 17 +++- notmuch-search.c | 32 +++++-- notmuch-show.c | 50 +++++++---- test/count | 4 +- test/notmuch-test | 1 + test/search | 48 ---------- test/search-excludes | 219 +++++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 342 insertions(+), 102 deletions(-) create mode 100755 test/search-excludes -- 1.7.9.1