commit 1e17e3a8a6e3c875780d6b61551048c336b469c9
parent 334e6ca52e9f76bf783797cb2e5bff0f3751bb71
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date: Sat, 27 Feb 2010 00:29:03 -0800
Merge branch 'master' into next
Diffstat:
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -261,6 +261,7 @@ else
:ask_for_subject => true,
:confirm_no_attachments => true,
:confirm_top_posting => true,
+ :jump_to_open_message => true,
:discard_snippets_from_encrypted_messages => false,
:default_attachment_save_dir => "",
:sent_source => "sup://sent",
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
@@ -119,7 +119,7 @@ EOS
mode = ThreadViewMode.new t, @hidden_labels, self
BufferManager.spawn t.subj, mode
BufferManager.draw_screen
- mode.jump_to_first_open
+ mode.jump_to_first_open if $config[:jump_to_open_message]
BufferManager.draw_screen # lame TODO: make this unnecessary
## the first draw_screen is needed before topline and botline
## are set, and the second to show the cursor having moved
diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
@@ -339,7 +339,7 @@ EOS
elsif chunk.viewable?
view chunk
end
- if chunk.is_a?(Message)
+ if chunk.is_a?(Message) && $config[:jump_to_open_message]
jump_to_message chunk
jump_to_next_open if layout.state == :closed
end