X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fnotmuch.vim;h=ad8b7c800cd5cca1b9b4c23fe226d57c4e414191;hp=cb6695a80715e2aa4b183a8eaee6da4ef4bc62cc;hb=HEAD;hpb=9d4ff29ad86e24d0cc3500ca1d0ef2ab91cde222

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index cb6695a8..c1c2f63d 100644
--- 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)
@@ -644,7 +647,7 @@ ruby << EOF
 					q.add_tag_exclude(t)
 				}
 				$searches << search
-				count = count_threads ? q.search_threads.count : q.search_messages.count
+				count = count_threads ? q.count_threads : q.count_messages
 				b << "%9d %-20s (%s)" % [count, name, search]
 			end
 		end
@@ -666,7 +669,7 @@ ruby << EOF
 				date = Time.at(e.newest_date).strftime(date_fmt)
 				subject = e.messages.first['subject']
 				if $mail_installed
-					subject = Mail::Field.new("Subject: " + subject).to_s
+					subject = Mail::Field.parse("Subject: " + subject).to_s
 				else
 					subject = subject.force_encoding('utf-8')
 				end