Revert "Vim: Ensure that every queries respect excluded tags"

This reverts commit 0998fa9a09387b622d770fc8c5f780a951b0cf2a.

per id:CAMP44s2k+fthVXCS9R9kQRzzwWbnS7RAcKg1Q0m6q5Ybzdm71Q@mail.gmail.com

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 8e547d4e50a16202c1a2a8c99d414e6a7f898f08..c1c2f63d20178dab69f92c9ff9aab4631dda6ee5 100644 (file)
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -317,6 +317,9 @@ ruby << EOF
        $curbuf.render do |b|
                q = $curbuf.query(get_cur_view)
                q.sort = Notmuch::SORT_OLDEST_FIRST
+               $exclude_tags.each { |t|
+                       q.add_tag_exclude(t)
+               }
                msgs = q.search_messages
                msgs.each do |msg|
                        m = Mail.read(msg.filename)
@@ -640,6 +643,9 @@ ruby << EOF
                        $searches.clear
                        folders.each do |name, search|
                                q = $curbuf.query(search)
+                               $exclude_tags.each { |t|
+                                       q.add_tag_exclude(t)
+                               }
                                $searches << search
                                count = count_threads ? q.count_threads : q.count_messages
                                b << "%9d %-20s (%s)" % [count, name, search]
@@ -651,6 +657,9 @@ ruby << EOF
                date_fmt = VIM::evaluate('g:notmuch_date_format')
                q = $curbuf.query(search)
                q.sort = Notmuch::SORT_NEWEST_FIRST
+               $exclude_tags.each { |t|
+                       q.add_tag_exclude(t)
+               }
                $threads.clear
                t = q.search_threads
 
@@ -702,9 +711,6 @@ ruby << EOF
                def query(*args)
                        q = @db.query(*args)
                        @queries << q
-                       $exclude_tags.each { |t|
-                           q.add_tag_exclude(t)
-                       }
                        q
                end