distinguish search types, and blank searches now do nothing

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@691 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/bin/sup b/bin/sup
index c3ae75cf80140639a69310d6368bfcb3f55c67c9..9da75d798314c2ef7aaae3e9b206a110576d8a3f 100644 (file)
--- a/bin/sup
+++ b/bin/sup
@@ -40,7 +40,7 @@ global_keymap = Keymap.new do |k|
   k.add :list_buffers, "List all buffers", 'B'
   k.add :list_contacts, "List contacts", 'C'
   k.add :redraw, "Redraw screen", :ctrl_l
-  k.add :search, "Search all messages", '\\'
+  k.add :search, "Search all messages", '\\', 'F'
   k.add :list_labels, "List labels", 'L'
   k.add :poll, "Poll for new messages", 'P'
   k.add :compose, "Compose new message", 'm', 'c'
@@ -227,7 +227,7 @@ begin
         b = bm.spawn_unless_exists("Contact List") { ContactListMode.new }
         b.mode.load_in_background
       when :search
-        query = BufferManager.ask :search, "query: "
+        query = BufferManager.ask :search, "search all messages: "
         next unless query && query !~ /^\s*$/
         SearchResultsMode.spawn_from_query query
       when :list_labels

diff --git a/lib/sup/modes/scroll-mode.rb b/lib/sup/modes/scroll-mode.rb
index b70a6dc508dd5a2fe49563d823df18e29b399eeb..89684bf84e894ad021c8dc96777e55516cfea906 100644 (file)
--- a/lib/sup/modes/scroll-mode.rb
+++ b/lib/sup/modes/scroll-mode.rb
@@ -78,7 +78,8 @@ class ScrollMode < Mode
   end
 
   def search_in_buffer
-    query = BufferManager.ask(:search, "query: ") or return
+    query = BufferManager.ask :search, "search in buffer: "
+    return if query.nil? || query.empty?
     @search_query = Regexp.escape query
     continue_search_in_buffer
   end