sup

commit 10a7c245e718e8f05d1d4891c98de017385bd3d9
parent 8b2656752b0f86e1ba3e6f6bdb6c4b7a40546393
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Sun, 29 Mar 2009 09:38:21 -0700

Merge branch 'master' into next

Diffstat:

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
@@ -510,9 +510,14 @@ EOS
   end
 
   def tag_matching
-    query = BufferManager.ask :search, "tag threads matching: "
+    query = BufferManager.ask :search, "tag threads matching (regex): "
     return if query.nil? || query.empty?
-    query = /#{query}/i
+    query = begin
+      /#{query}/i
+    rescue RegexpError => e
+      BufferManager.flash "error interpreting '#{query}': #{e.message}"
+      return
+    end
     @mutex.synchronize { @threads.each { |t| @tags.tag t if thread_matches?(t, query) } }
     regen_text
   end