Merge branch 'master' into next

commit f606a8d522389c184fd21dd96e365d56de7d0e0e
parent 07cbc361fdeed42067e9bdfa24270024acca4993
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue, 18 Aug 2009 13:38:17 -0400

Merge branch 'master' into next

Diffstat:

bin/sup

+++

1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -78,6 +78,7 @@ 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'
 end
 
 ## the following magic enables wide characters when used with a ruby
@@ -292,6 +293,8 @@ begin
         b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
         b.mode.load_threads :num => b.content_height if new
       end
+    when :show_inbox
+      BufferManager.raise_to_front ibuf
     when :nothing, InputSequenceAborted
     when :redraw
       bm.completely_redraw_screen

sup.git