Merge branch 'ncurses-fixes' into next

[sup] / lib / sup.rb

diff --git a/lib/sup.rb b/lib/sup.rb
index ed144589a705abd854573e9b9f6eddf247ec458a..a6e5aef86d09cebd22cd313837d2206620be9191 100644 (file)
--- a/lib/sup.rb
+++ b/lib/sup.rb
@@ -114,7 +114,6 @@ module Redwood
     Redwood::DraftManager.init Redwood::DRAFT_DIR
     Redwood::UpdateManager.init
     Redwood::PollManager.init
-    Redwood::SuicideManager.init Redwood::SUICIDE_FN
     Redwood::CryptoManager.init
     Redwood::UndoManager.init
     Redwood::SourceManager.init
@@ -253,7 +252,6 @@ require "sup/modes/scroll-mode"
 require "sup/modes/text-mode"
 require "sup/modes/log-mode"
 require "sup/update"
-require "sup/suicide"
 require "sup/message-chunks"
 require "sup/message"
 require "sup/source"
@@ -263,6 +261,7 @@ require "sup/imap"
 require "sup/person"
 require "sup/account"
 require "sup/thread"
+require "sup/interactive-lock"
 require "sup/index"
 require "sup/textfield"
 require "sup/colormap"