From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 8 Sep 2009 19:37:51 +0000 (-0400)
Subject: Merge branch 'console-mode'
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=2388e4a48a6d3ea5e626fccf9588a6a177e7065e;p=sup

Merge branch 'console-mode'

Conflicts:
	bin/sup
---

2388e4a48a6d3ea5e626fccf9588a6a177e7065e
diff --cc bin/sup
index 605c553,2b4fee7..b3a4f45
--- a/bin/sup
+++ b/bin/sup
@@@ -78,7 -78,7 +78,8 @@@ global_keymap = Keymap.new do |k
    k.add :compose, "Compose new message", 'm', 'c'
    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 -297,9 +296,14 @@@ begi
          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