From 52231f3404f126b6e3f8f06567fc21fa16728fb4 Mon Sep 17 00:00:00 2001
From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Tue, 6 Nov 2007 23:00:40 +0000
Subject: [PATCH] add prompt_for_subject configuration option

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@671 5c8cc53c-5e98-4d25-b20a-d8db53a31250
---
 lib/sup.rb                    | 1 +
 lib/sup/message-chunks.rb     | 2 +-
 lib/sup/modes/compose-mode.rb | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/sup.rb b/lib/sup.rb
index f84fa17..e66b27f 100644
--- a/lib/sup.rb
+++ b/lib/sup.rb
@@ -198,6 +198,7 @@ else
     :edit_signature => false,
     :ask_for_cc => true,
     :ask_for_bcc => false,
+    :ask_for_subject => true,
     :confirm_no_attachments => true,
     :confirm_top_posting => true,
   }
diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb
index 477ba64..8343c20 100644
--- a/lib/sup/message-chunks.rb
+++ b/lib/sup/message-chunks.rb
@@ -86,7 +86,7 @@ EOS
     def viewable?; @lines.nil? end
     def view!
       path = write_to_disk
-      system "/usr/bin/run-mailcap --action=view #{@content_type}:#{path} >& /dev/null"
+      system "/usr/bin/run-mailcap --action=view #{@content_type}:#{path} > /dev/null 2> /dev/null"
       $? == 0
     end
 
diff --git a/lib/sup/modes/compose-mode.rb b/lib/sup/modes/compose-mode.rb
index df132bf..cb971da 100644
--- a/lib/sup/modes/compose-mode.rb
+++ b/lib/sup/modes/compose-mode.rb
@@ -5,8 +5,9 @@ module CanSpawnComposeMode
     to = opts[:to] || BufferManager.ask_for_contacts(:people, "To: ") or return
     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]
+    subj = opts[:subj] || BufferManager.ask(:subject, "Subject: ") or return if $config[:ask_for_subject]
     
-    mode = ComposeMode.new :to => to, :cc => cc, :bcc => bcc
+    mode = ComposeMode.new :to => to, :cc => cc, :bcc => bcc, :subj => subj
     BufferManager.spawn "New Message", mode
     mode.edit_message
   end
-- 
2.45.2