Quoth Mark Walters on Feb 15 at 9:03 am: > This option turns off the exclusion so all matching messages are > returned. We do not need to add this to notmuch-show as that does not > (yet) exclude. > --- > notmuch-count.c | 17 +++++++++++------ > notmuch-search.c | 17 +++++++++++------ > 2 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/notmuch-count.c b/notmuch-count.c > index 63459fb..5364507 100644 > --- a/notmuch-count.c > +++ b/notmuch-count.c > @@ -35,8 +35,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) > char *query_str; > int opt_index; > int output = OUTPUT_MESSAGES; > - const char **search_exclude_tags; > - size_t search_exclude_tags_length; > + notmuch_bool_t no_exclude = FALSE; > unsigned int i; > > notmuch_opt_desc_t options[] = { > @@ -44,6 +43,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) > (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS }, > { "messages", OUTPUT_MESSAGES }, > { 0, 0 } } }, > + { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 }, > { 0, 0, 0, 0, 0 } > }; > > @@ -78,10 +78,15 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) > return 1; > } > > - search_exclude_tags = notmuch_config_get_search_exclude_tags > - (config, &search_exclude_tags_length); > - for (i = 0; i < search_exclude_tags_length; i++) > - notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); > + if (!no_exclude) { > + const char **search_exclude_tags; > + size_t search_exclude_tags_length; > + > + search_exclude_tags = notmuch_config_get_search_exclude_tags > + (config, &search_exclude_tags_length); > + for (i = 0; i < search_exclude_tags_length; i++) > + notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); > + } > > switch (output) { > case OUTPUT_MESSAGES: > diff --git a/notmuch-search.c b/notmuch-search.c > index d504051..43ec90b 100644 > --- a/notmuch-search.c > +++ b/notmuch-search.c > @@ -423,8 +423,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) > output_t output = OUTPUT_SUMMARY; > int offset = 0; > int limit = -1; /* unlimited */ > - const char **search_exclude_tags; > - size_t search_exclude_tags_length; > + notmuch_bool_t no_exclude = FALSE; > unsigned int i; > > enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } > @@ -446,6 +445,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) > { "files", OUTPUT_FILES }, > { "tags", OUTPUT_TAGS }, > { 0, 0 } } }, > + { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 }, Indentation error. Otherwise this patch LGTM. > { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, > { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, > { 0, 0, 0, 0, 0 } > @@ -493,10 +493,15 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) > > notmuch_query_set_sort (query, sort); > > - search_exclude_tags = notmuch_config_get_search_exclude_tags > - (config, &search_exclude_tags_length); > - for (i = 0; i < search_exclude_tags_length; i++) > - notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); > + if (!no_exclude) { > + const char **search_exclude_tags; > + size_t search_exclude_tags_length; > + > + search_exclude_tags = notmuch_config_get_search_exclude_tags > + (config, &search_exclude_tags_length); > + for (i = 0; i < search_exclude_tags_length; i++) > + notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); > + } > > switch (output) { > default: