commit 7f394ad567fc7615137dba10d5397b675b93e63f
parent f4be1427f7621ac8d510e665062b98feb70e707f
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 5 Jan 2010 13:25:02 -0800
Merge branch 'master' into next
Diffstat:
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/sup/modes/inbox-mode.rb b/lib/sup/modes/inbox-mode.rb
@@ -66,9 +66,10 @@ class InboxMode < ThreadIndexMode
return unless cursor_thread
thread = cursor_thread # to make sure lambda only knows about 'old' cursor_thread
+ was_unread = thread.labels.member? :unread
UndoManager.register "reading and archiving thread" do
thread.apply_label :inbox
- thread.apply_label :unread
+ thread.apply_label :unread if was_unread
add_or_unhide thread.first
end
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
@@ -405,7 +405,7 @@ EOS
jump_to_line n unless n >= topline && n < botline
set_cursor_pos n
else
- BufferManager.flash "No new messages"
+ BufferManager.flash "No new messages."
end
end