sup

commit 5a45d6fe4e1f965313cb9ab0b5f68dc3e6d19bf5
parent 263de0c66adf1ba2d311414cf3a2ff2624d24cfb
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date:   Thu,  3 Jun 2010 19:04:42 -0700

Merge branch 'master' into next

Diffstat:

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
@@ -558,9 +558,9 @@ EOS
   end
 
   def ask_for_account domain, question
-    default = AccountManager.default_account.email
     completions = AccountManager.user_emails
-    answer = BufferManager.ask_many_emails_with_completions domain, question, completions, default
+    answer = BufferManager.ask_many_emails_with_completions domain, question, completions, ""
+    answer = AccountManager.default_account.email if answer == ""
     AccountManager.account_for Person.from_address(answer).email if answer
   end
 
diff --git a/lib/sup/modes/compose-mode.rb b/lib/sup/modes/compose-mode.rb
@@ -21,7 +21,7 @@ class ComposeMode < EditMessageMode
   end
 
   def self.spawn_nicely opts={}
-    from = opts[:from] || (BufferManager.ask_for_account(:account, "From: ") or return if $config[:ask_for_from])
+    from = opts[:from] || (BufferManager.ask_for_account(:account, "From (default #{AccountManager.default_account.email}): ") or return if $config[:ask_for_from])
     to = opts[:to] || (BufferManager.ask_for_contacts(:people, "To: ", [opts[:to_default]]) or return if ($config[:ask_for_to] != false))
     cc = opts[:cc] || (BufferManager.ask_for_contacts(:people, "Cc: ") or return if $config[:ask_for_cc])
     bcc = opts[:bcc] || (BufferManager.ask_for_contacts(:people, "Bcc: ") or return if $config[:ask_for_bcc])
diff --git a/lib/sup/modes/edit-message-mode.rb b/lib/sup/modes/edit-message-mode.rb
@@ -494,7 +494,7 @@ private
              AccountManager.default_account).signature
 
     if sigfn && File.exists?(sigfn)
-      ["", "-- "] + File.readlines(sigfn).map { |l| l.chomp }
+      ["", "--"] + File.readlines(sigfn).map { |l| l.chomp }
     else
       []
     end