Vim: Ensure that every queries respect excluded tags

This makes sure that the bug solved by the previous commit won't happen again
and remove some dupplication.
This shouldn't have any side effect.
This commit is contained in:
Jules Aguillon 2021-02-17 00:43:16 +01:00 committed by David Bremner
parent c3c74621fa
commit 0998fa9a09

View file

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