Merge remote-tracking branch 'origin/master' into repobrowse

* origin/master:
  config: do not slurp lines into memory
  TODO: several updates
  search: schema version bump for empty References/In-Reply-To
  Revert "searchidx: reindex clobbers old thread IDs"
  searchidx: reindex clobbers old thread IDs
  searchidx: deal with empty In-Reply-To and References headers
  searchview: increase limit for displaying search results
  searchview: clarify numeric summary at bottom
  add filter for Subject: tags
  watchmaildir: allow arguments for filters
  watchmaildir: limit live importer processes
  learn: implement "rm" only functionality
  mime: avoid SUPER usage in Email::MIME subclass
  inbox: reinstate periodic cleanup of Xapian and SQLite objects
  introduce PublicInbox::MIME wrapper class

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 2a33fd29..e5d57550 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -5,7 +5,7 @@
 package PublicInbox::Feed;
 use strict;
 use warnings;
-use Email::MIME;
+use PublicInbox::MIME;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 
@@ -39,7 +39,7 @@ sub generate_thread_atom {
         PublicInbox::WwwAtomStream->response($ctx, 200, sub {
                 while (my $msg = shift @$msgs) {
                         $msg = $ibx->msg_by_smsg($msg) and
-                                        return Email::MIME->new($msg);
+                                return PublicInbox::MIME->new($msg);
                 }
         });
 }
@@ -175,7 +175,7 @@ sub each_recent_blob {
 sub do_cat_mail {
         my ($ibx, $path) = @_;
         my $mime = eval { $ibx->msg_by_path($path) } or return;
-        Email::MIME->new($mime);
+        PublicInbox::MIME->new($mime);
 }
 
 1;