sup

commit 63034156a4c964b44a1cba2d097f8a22dffa3e4e
parent 5afdb4528b5cc7d102d38d4fe275b8aa60159cf4
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Sun,  3 Jan 2010 17:16:18 -0500

Merge branch 'master' into next

Diffstat:

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lib/sup/modes/buffer-list-mode.rb b/lib/sup/modes/buffer-list-mode.rb
@@ -4,6 +4,7 @@ class BufferListMode < LineCursorMode
   register_keymap do |k|
     k.add :jump_to_buffer, "Jump to selected buffer", :enter
     k.add :reload, "Reload buffer list", "@"
+    k.add :kill_selected_buffer, "Kill selected buffer", "X"
   end
 
   def initialize
@@ -40,6 +41,10 @@ protected
   def jump_to_buffer
     BufferManager.raise_to_front @bufs[curpos][1]
   end
+
+  def kill_selected_buffer
+    reload if BufferManager.kill_buffer_safely @bufs[curpos][1]
+  end
 end
 
 end
diff --git a/lib/sup/xapian_index.rb b/lib/sup/xapian_index.rb
@@ -48,6 +48,8 @@ EOS
   end
 
   def save_index
+    info "Flushing Xapian updates to disk. This may take a while..."
+    @xapian.flush
   end
 
   def optimize