bugfixes

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@266 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/lib/sup/modes/compose-mode.rb b/lib/sup/modes/compose-mode.rb
index 677d9995a6f8cf6f19f8600eb297071c74259440..3c58e0b2419480a42dbaabdcaba7894f32e9c355 100644 (file)
--- a/lib/sup/modes/compose-mode.rb
+++ b/lib/sup/modes/compose-mode.rb
@@ -15,7 +15,7 @@ class ComposeMode < EditMessageMode
     @header["Bcc"] = opts[:bcc].map { |p| p.full_address }.join(", ") if opts[:bcc]
     @header["Subject"] = opts[:subj] if opts[:subj]
 
-    @body = opts[:body] || sig_lines
+    @body = (opts[:body] || []) + sig_lines
     regen_text
   end
 

diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
index be4079adafb76a0e6086a1e7e01771c5d435b1d1..0568f1bb320d316ef1f5e693a6f9e734ab12840c 100644 (file)
--- a/lib/sup/modes/thread-view-mode.rb
+++ b/lib/sup/modes/thread-view-mode.rb
@@ -301,7 +301,7 @@ private
       unless @layout.member? m
         l = @layout[m] = Layout.new
         l.state = initial_state_for m
-        l.color = prevm && prevm.color == :message_patina_color ? :alternate_patina_color : :message_patina_color
+        l.color = prevm && @layout[prevm].color == :message_patina_color ? :alternate_patina_color : :message_patina_color
       end
       l = @layout[m]