Merge remote-tracking branch 'origin/debian/bullseye' into release

[notmuch] / vim / notmuch.vim

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index cb6695a80715e2aa4b183a8eaee6da4ef4bc62cc..541698cdfee7939e05aa3554ff39c91295920940 100644 (file)
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -644,7 +644,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 +666,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