X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fquery.cc;h=68ac1e40178548f53dae91a263972eb210fdccf1;hp=1e5e99a52bd08f06cfd223c55bf857f78a575f19;hb=596a2076dcc1ebec2dc217f6d967397ef125aac4;hpb=75a05526334b721d719d6c8a8098ff64573e6c1e

diff --git a/lib/query.cc b/lib/query.cc
index 1e5e99a5..68ac1e40 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -219,13 +219,14 @@ notmuch_query_search_messages (notmuch_query_t *query)
 
 	if (query->exclude_terms) {
 	    exclude_query = _notmuch_exclude_tags (query, final_query);
-	    exclude_query = Xapian::Query (Xapian::Query::OP_AND,
-					   exclude_query, final_query);
 
 	    if (query->omit_excluded_messages)
 		final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
 					     final_query, exclude_query);
 	    else {
+		exclude_query = Xapian::Query (Xapian::Query::OP_AND,
+					   exclude_query, final_query);
+
 		enquire.set_weighting_scheme (Xapian::BoolWeight());
 		enquire.set_query (exclude_query);
 
@@ -261,9 +262,12 @@ notmuch_query_search_messages (notmuch_query_t *query)
 	    break;
 	}
 
-	if (_debug_query ())
+	if (_debug_query ()) {
+	    fprintf (stderr, "Exclude query is:\n%s\n",
+		     exclude_query.get_description ().c_str ());
 	    fprintf (stderr, "Final query is:\n%s\n",
 		     final_query.get_description ().c_str ());
+	}
 
 	enquire.set_query (final_query);
 
@@ -537,9 +541,12 @@ notmuch_query_count_messages (notmuch_query_t *query)
 	enquire.set_weighting_scheme(Xapian::BoolWeight());
 	enquire.set_docid_order(Xapian::Enquire::ASCENDING);
 
-	if (_debug_query ())
+	if (_debug_query ()) {
+	    fprintf (stderr, "Exclude query is:\n%s\n",
+		     exclude_query.get_description ().c_str ());
 	    fprintf (stderr, "Final query is:\n%s\n",
 		     final_query.get_description ().c_str ());
+	}
 
 	enquire.set_query (final_query);