commit 99ac344d15f5f4fc0e1c50bf2a6206a019571ca8
parent c635624809687dc08c1b722c18bd468d60f7c028
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sat, 2 Feb 2008 17:02:30 -0800
Merge branch 'cancel-search' into next
Diffstat:
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
@@ -472,7 +472,7 @@ EOS
last_update = Time.now
@ts.load_n_threads(ts_to_load, opts) do |i|
if (Time.now - last_update) >= 0.25
- BufferManager.say "Loaded #{i.pluralize 'thread'} (use ^G to cancel)...", @mbid
+ BufferManager.say "Loaded #{i.pluralize 'thread'}...", @mbid
update
BufferManager.draw_screen
last_update = Time.now
@@ -515,10 +515,8 @@ EOS
myopts = @load_thread_opts.merge({ :when_done => (lambda do |num|
opts[:when_done].call(num) if opts[:when_done]
- cancelled = @interrupt_search?" (search cancelled by user)":""
-
if num > 0
- BufferManager.flash "Found #{num.pluralize 'thread'}#{cancelled}."
+ BufferManager.flash "Found #{num.pluralize 'thread'}."
else
BufferManager.flash "No matches."
end