]> git.notmuchmail.org Git - sup/commitdiff
Merge branch 'better-buffer-list' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Thu, 9 Apr 2009 17:22:55 +0000 (13:22 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Thu, 9 Apr 2009 17:22:55 +0000 (13:22 -0400)
1  2 
bin/sup
lib/sup/buffer.rb
lib/sup/modes/edit-message-mode.rb
lib/sup/modes/thread-index-mode.rb
lib/sup/poll.rb

diff --cc bin/sup
Simple merge
Simple merge
Simple merge
index 802406fd4872dd145eee76f5f5e789f3b9e4bd01,0bce0dee002d4d78be9d72c515a8b0d007520fd2..7b87bf66ba9112a3fb20a465a540f6c0eef085ba
@@@ -42,9 -42,8 +42,9 @@@ EO
      k.add :toggle_tagged, "Tag/untag selected thread", 't'
      k.add :toggle_tagged_all, "Tag/untag all threads", 'T'
      k.add :tag_matching, "Tag matching threads", 'g'
-     k.add :apply_to_tagged, "Apply next command to all tagged threads", ';'
+     k.add :apply_to_tagged, "Apply next command to all tagged threads", '+'
      k.add :join_threads, "Force tagged threads to be joined into the same thread", '#'
 +    k.add :undo, "Undo the previous action", 'u'
    end
  
    def initialize hidden_labels=[], load_thread_opts={}
diff --cc lib/sup/poll.rb
Simple merge