NEWS: emacs: support text/calendar MIME type

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 8867aabcea9dc12b7359cda0abe79a5d8a990bf3..92ce38a1a5fb37454237c09313e099aa6f8f9b52 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -90,6 +90,9 @@ format_thread_json (const void *ctx,
                    const int total,
                    const char *authors,
                    const char *subject);
+
+/* Any changes to the JSON format should be reflected in the file
+ * devel/schemata. */
 static const search_format_t format_json = {
     "[",
        "{",
@@ -423,8 +426,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     output_t output = OUTPUT_SUMMARY;
     int offset = 0;
     int limit = -1; /* unlimited */
-    const char **auto_exclude_tags;
-    size_t auto_exclude_tags_length;
+    const char **search_exclude_tags;
+    size_t search_exclude_tags_length;
     unsigned int i;
 
     enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }
@@ -493,10 +496,10 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
 
     notmuch_query_set_sort (query, sort);
 
-    auto_exclude_tags = notmuch_config_get_auto_exclude_tags
-       (config, &auto_exclude_tags_length);
-    for (i = 0; i < auto_exclude_tags_length; i++)
-       notmuch_query_add_tag_exclude (query, auto_exclude_tags[i]);
+    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: