From: William Morgan <wmorgan-sup@masanjin.net>
Date: Fri, 29 Feb 2008 03:11:09 +0000 (-0800)
Subject: Merge branch 'speedy-index' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=ff6e6801ea7c2804dc061db00632ac7c0d370d32;p=sup

Merge branch 'speedy-index' into next

Conflicts:

	lib/sup/poll.rb
---

ff6e6801ea7c2804dc061db00632ac7c0d370d32
diff --cc lib/sup/poll.rb
index d32c893,09f5de3..87cf996
--- a/lib/sup/poll.rb
+++ b/lib/sup/poll.rb
@@@ -156,8 -156,8 +156,8 @@@ EO
  
            docid, entry = Index.load_entry_for_id m.id
            HookManager.run "before-add-message", :message => m
 -          m = yield(m, offset, entry) or next
 +          m = yield(m, offset, entry) or next if block_given?
-           Index.sync_message m, docid, entry
+           Index.sync_message m, docid, entry, opts
            UpdateManager.relay self, :added, m unless entry
          rescue MessageFormatError => e
            Redwood::log "ignoring erroneous message at #{source}##{offset}: #{e.message}"