This series implements the proposal in id:"87y5riuz7v.fsf@qmul.ac.uk" to move to a consistent --with-excluded approach rather than the previous --no-exclude approach. See the message there and its descendants for discussion. The main user side change is that notmuch-search no longer defaults to showing all the excluded threads with [0/n] but will do so if the user says they want all the messages (i.e., by specifying --with-excluded). However, it makes everything consistent throughout the commandline and lib interfaces. In all cases a "message" type search only returns the non-excluded matches (unless --with-excluded is specified) and a "thread" type search returns all messages (including excluded ones) in threads that match in a non-excluded message. The patch series is bigger than I would like but it is relatively simple: the slightly tricky logic of the original series is untouched. This series just changes the names and defaults fed to the existing logic. The only slightly complicated part is the notmuch-show.c patch as it has to decide quite what to do in lots of cases. See id:"87d38t26wp.fsf@qmul.ac.uk" for reasons for the precise choices made. Best wishes Mark Mark Walters (5): lib: rename (and negate) set_omit_excluded set_with_excluded cli: move count to the new --with-excluded naming scheme. cli: move search to the new --with-excluded naming scheme. cli: move show to the new --with-excluded naming scheme. emacs: make show set --with-excluded emacs/notmuch-show.el | 6 ++++-- lib/notmuch.h | 12 +++++++----- lib/query.cc | 10 +++++----- man/man1/notmuch-count.1 | 4 ++-- man/man1/notmuch-search.1 | 6 ++++-- man/man1/notmuch-show.1 | 5 +++-- notmuch-client.h | 1 + notmuch-count.c | 11 ++++++----- notmuch-search.c | 20 +++++++++++--------- notmuch-show.c | 38 +++++++++++++++++++++----------------- test/count | 4 ++-- test/search | 9 ++++----- 12 files changed, 70 insertions(+), 56 deletions(-) -- 1.7.2.3