lib/sup/modes/inbox_mode.rb in sup-0.15.4 vs lib/sup/modes/inbox_mode.rb in sup-0.16.0

@@ -4,11 +4,10 @@
 
 class InboxMode < ThreadIndexMode
   register_keymap do |k|
     ## overwrite toggle_archived with archive
     k.add :archive, "Archive thread (remove from inbox)", 'a'
-    k.add :read_and_archive, "Archive thread (remove from inbox) and mark read", 'A'
     k.add :refine_search, "Refine search", '|'
   end
 
   def initialize
     super [:inbox, :sent, :draft], { :label => :inbox, :skip_killed => true }
@@ -59,50 +58,9 @@
     threads.each do |t|
       t.remove_label :inbox
       hide_thread t
     end
     regen_text
-    threads.each { |t| Index.save_thread t }
-  end
-
-  def read_and_archive
-    return unless cursor_thread
-    thread = cursor_thread # to make sure lambda only knows about 'old' cursor_thread
-
-    was_unread = thread.labels.member? :unread
-    UndoManager.register "reading and archiving thread" do
-      thread.apply_label :inbox
-      thread.apply_label :unread if was_unread
-      add_or_unhide thread.first
-      Index.save_thread thread
-    end
-
-    cursor_thread.remove_label :unread
-    cursor_thread.remove_label :inbox
-    hide_thread cursor_thread
-    regen_text
-    Index.save_thread thread
-  end
-
-  def multi_read_and_archive threads
-    old_labels = threads.map { |t| t.labels.dup }
-
-    threads.each do |t|
-      t.remove_label :unread
-      t.remove_label :inbox
-      hide_thread t
-    end
-    regen_text
-
-    UndoManager.register "reading and archiving #{threads.size.pluralize 'thread'}" do
-      threads.zip(old_labels).each do |t, l|
-        t.labels = l
-        add_or_unhide t.first
-        Index.save_thread t
-      end
-      regen_text
-    end
-
     threads.each { |t| Index.save_thread t }
   end
 
   def handle_unarchived_update sender, m
     add_or_unhide m