sup

commit 492d16e017fde4ccda001c5b52b531e54ad3b59d
parent 8c97c9256c9ba19479234f7385612968297d51ee
Author: Gaute Hope <eg@gaute.vetsj.com>
Date:   Fri, 22 May 2015 09:44:44 +0200

Merge branch 'tweak-and-query' into develop

Diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/sup-tweak-labels b/bin/sup-tweak-labels
@@ -82,7 +82,7 @@ begin
     ## query to only messages with those labels
     query += " (" + remove_labels.map { |l| "label:#{l}" }.join(" OR ") + ")"
   end
-  query += ' ' + opts[:query] if opts[:query]
+  query += ' AND ' + opts[:query] if opts[:query]
 
   parsed_query = index.parse_query query
   parsed_query.merge! :load_spam => true, :load_deleted => true, :load_killed => true