commit af7e80d9cad199f7ab061fbb940a8af9cefe225f
parent 47d6b9d04a388431d09761b0dcf227d558afe6db
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date: Sun, 14 Mar 2010 22:11:52 -0700
Merge branch 'master' into next
Diffstat:
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -264,7 +264,8 @@ else
:default_attachment_save_dir => "",
:sent_source => "sup://sent",
:poll_interval => 300,
- :wrap_width => 0
+ :wrap_width => 0,
+ :slip_rows => 0
}
begin
FileUtils.mkdir_p Redwood::BASE_DIR
diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
@@ -111,7 +111,7 @@ EOS
## objects. @person_lines is a map from row #s to Person objects.
def initialize thread, hidden_labels=[], index_mode=nil
- super()
+ super :slip_rows => $config[:slip_rows]
@thread = thread
@hidden_labels = hidden_labels