Merge branch 'cancel-search' into next

diff --cc lib/sup/modes/thread-index-mode.rb
index bc240e96c5826f91112fb44d1ef6ad6a5a18df0a,73abe95fb9959961eac652c309bc91b82ed56a4c..629f8df7f95f66cc69c3cdf8250dd3994a2da3ff
--- 1/lib/sup/modes/thread-index-mode.rb
--- 2/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@@ -465,14 -462,11 +465,14 @@@ EO
      @interrupt_search = false
      @mbid = BufferManager.say "Searching for threads..."
  
 +    ts_to_load = n
 +    ts_to_load = ts_to_load + @ts.size unless n == -1 # -1 means all threads
 +
      orig_size = @ts.size
      last_update = Time.now
 -    @ts.load_n_threads(@ts.size + n, opts) do |i|
 +    @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