Merge branches 'dispatch-next-fix', 'handle-deletion-fix' and 'handle-spam-fix' into...

diff --cc lib/sup/modes/thread-index-mode.rb
index 629f8df7f95f66cc69c3cdf8250dd3994a2da3ff,cdc0b7306275bd121970fc54c6c491c7be555982,5985cae25deb3998d8569c6e1d3266244ebd81bc,460de1fe4e24fabfb3f0a9342f3bd5ce4647b940..23c76c310a40b1fd044aa660e5375f3fd309322f
--- 1/lib/sup/modes/thread-index-mode.rb
--- 2/lib/sup/modes/thread-index-mode.rb
--- 3/lib/sup/modes/thread-index-mode.rb
--- 4/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@@@@ -172,13 -170,13 -166,12 -166,20 +176,19 @@@@@ EO
      end
    
      def handle_deleted_update sender, m
-- -    @ts_mutex.synchronize do
-- -      return unless @ts.contains? m
-- -      @ts.remove_thread_containing_id m.id
-- -    end
++ +    t = @ts_mutex.synchronize { @ts.thread_for m }
++ +    return unless t
++ +    hide_thread t
++      update
++    end
++  
+++   def handle_spammed_update sender, m
+++     t = @ts_mutex.synchronize { @ts.thread_for m }
+++     return unless t
+++     hide_thread t
  +     update
  +   end
  + 
      def handle_undeleted_update sender, m
        add_or_unhide m
      end

diff --cc lib/sup/modes/thread-view-mode.rb
Simple merge