commit 20a44f806404c2f4419030433fe2e38109ee72d5
parent 3ca03ddcca8ed0b94cf3f175ef6724e5fa9dfec5
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Thu, 7 Feb 2008 14:12:39 -0800
Merge branch 'startup-compose' into next
Diffstat:
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -32,10 +32,11 @@ Usage:
Options are:
EOS
- opt :list_hooks, "List all hooks and descriptions thereof, and quit."
- opt :no_threads, "Turn of threading. Helps with debugging. (Necessarily disables background polling for new messages.)"
+ opt :list_hooks, "List all hooks and descriptions, and quit."
+ opt :no_threads, "Turn off threading. Helps with debugging. (Necessarily disables background polling for new messages.)"
opt :no_initial_poll, "Don't poll for new messages when starting."
- opt :search, "Search for threads ", :type => String
+ opt :search, "Search for this query upon startup", :type => String
+ opt :compose, "Compose message to this recipient upon startup", :type => String
end
if $opts[:list_hooks]
@@ -198,6 +199,10 @@ begin
imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] }
+ if $opts[:compose]
+ ComposeMode.spawn_nicely :to_default => $opts[:compose]
+ end
+
unless $opts[:no_threads]
PollManager.start
SuicideManager.start
diff --git a/lib/sup/modes/compose-mode.rb b/lib/sup/modes/compose-mode.rb
@@ -20,7 +20,7 @@ class ComposeMode < EditMessageMode
end
def self.spawn_nicely opts={}
- to = opts[:to] || BufferManager.ask_for_contacts(:people, "To: ") or return
+ to = opts[:to] || BufferManager.ask_for_contacts(:people, "To: ", [opts[:to_default]]) 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])