sup

commit 5f589e3c5f0c486a8f63e585df2236858a8a3abc
parent 2d2eb6aea581c4f562004182b9d5edef7549f92f
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Thu, 28 May 2009 10:59:45 -0400

Merge branch 'master' into next

Conflicts:

	lib/sup/modes/thread-index-mode.rb

Diffstat:

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
@@ -537,7 +537,7 @@ EOS
     user_labels.each { |l| LabelManager << l }
     update_text_for_line curpos
 
-    UndoManager.register "labeling thread #{thread.first.id}" do
+    UndoManager.register "labeling thread" do
       thread.labels = old_labels
       update_text_for_line pos
       UpdateManager.relay self, :labeled, thread.first
@@ -565,8 +565,8 @@ EOS
           t.remove_label l
         else
           t.apply_label l
+          LabelManager << l
         end
-        LabelManager << l
       end
       UpdateManager.relay self, :labeled, t.first
     end