Merge branch 'console-mode'

[sup] / bin / sup

diff --git a/bin/sup b/bin/sup
index 605c55342b11b1cdfd4e8fc9bfd64a98ba154129..b3a4f458772334a82832587a953394a4041d8ba5 100755 (executable)
--- a/bin/sup
+++ b/bin/sup
@@ -79,6 +79,7 @@ global_keymap = Keymap.new do |k|
   k.add :nothing, "Do nothing", :ctrl_g
   k.add :recall_draft, "Edit most recent draft message", 'R'
   k.add :show_inbox, "Show the Inbox buffer", 'I'
+  k.add :show_console, "Show the Console buffer", '~'
 end
 
 ## the following magic enables wide characters when used with a ruby
@@ -295,8 +296,14 @@ begin
         b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
         b.mode.load_threads :num => b.content_height if new
       end
+<<<<<<< HEAD:bin/sup
     when :show_inbox
       BufferManager.raise_to_front ibuf
+=======
+    when :show_console
+      b, new = bm.spawn_unless_exists("Console", :system => true) { ConsoleMode.new }
+      b.mode.run
+>>>>>>> console-mode:bin/sup
     when :nothing, InputSequenceAborted
     when :redraw
       bm.completely_redraw_screen