From 9b694dc1e91353eea23d0f92dc8df1d324c01a39 Mon Sep 17 00:00:00 2001
From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Wed, 20 Jun 2007 16:15:23 +0000
Subject: [PATCH] various minor bugfixes

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@465 5c8cc53c-5e98-4d25-b20a-d8db53a31250
---
 bin/sup                            | 2 +-
 lib/sup/modes/thread-index-mode.rb | 4 ++--
 lib/sup/modes/thread-view-mode.rb  | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/sup b/bin/sup
index ce7d24b..83f1e1d 100644
--- a/bin/sup
+++ b/bin/sup
@@ -168,7 +168,7 @@ begin
     end if s.respond_to? :connect
   end
 
-  imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread { sleep 1; PollManager.poll } }
+  imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread { sleep 1; PollManager.poll } unless $opts[:no_threads] }
 
   unless $opts[:no_threads]
     PollManager.start
diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
index 33e2062..73c9dda 100644
--- a/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@ -447,8 +447,8 @@ protected
   end
 
   def text_for_thread t
-    date = t.date.to_nice_s(Time.now)
-    from = author_text_for_thread(t)
+    date = t.date.to_nice_s
+    from = author_text_for_thread t
     if from.length > @from_width
       from = from[0 ... (@from_width - 1)]
       from += "." unless from[-1] == ?\s
diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
index a088c06..255b2bf 100644
--- a/lib/sup/modes/thread-view-mode.rb
+++ b/lib/sup/modes/thread-view-mode.rb
@@ -18,7 +18,7 @@ class ThreadViewMode < LineCursorMode
     k.add :show_header, "Show full message header", 'H'
     k.add :toggle_expanded, "Expand/collapse item", :enter
     k.add :expand_all_messages, "Expand/collapse all messages", 'E'
-    k.add :edit_message, "Edit message (drafts only)", 'e'
+    k.add :edit_draft, "Edit draft", 'e'
     k.add :expand_all_quotes, "Expand/collapse all quotes in a message", 'o'
     k.add :jump_to_next_open, "Jump to next open message", 'n'
     k.add :jump_to_prev_open, "Jump to previous open message", 'p'
@@ -184,11 +184,12 @@ class ThreadViewMode < LineCursorMode
     end
   end
 
-  def edit_message
+  def edit_draft
     m = @message_lines[curpos] or return
     if m.is_draft?
       mode = ResumeMode.new m
       BufferManager.spawn "Edit message", mode
+      BufferManager.kill_buffer self.buffer
       mode.edit
     else
       BufferManager.flash "Not a draft message!"
-- 
2.45.2