commit 5697a8ba17241369230de8c7437c96a583e6272e
parent 142f3888a478376de068d5b5bf5ccdbf710e7c87
Author: Hamish Downer <dmishd@gmail.com>
Date: Mon, 20 Jun 2011 00:27:52 +0100
resolve merge conflict from archive_sent branch
Diffstat:
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -262,10 +262,33 @@ EOS
## set up default configuration file
def load_config filename
+ default_config = {
+ :editor => ENV["EDITOR"] || "/usr/bin/vim -f -c 'setlocal spell spelllang=en_us' -c 'set filetype=mail'",
+ :thread_by_subject => false,
+ :edit_signature => false,
+ :ask_for_from => false,
+ :ask_for_to => true,
+ :ask_for_cc => true,
+ :ask_for_bcc => false,
+ :ask_for_subject => true,
+ :account_selector => true,
+ :confirm_no_attachments => true,
+ :confirm_top_posting => true,
+ :jump_to_open_message => true,
+ :discard_snippets_from_encrypted_messages => false,
+ :load_more_threads_when_scrolling => true,
+ :default_attachment_save_dir => "",
+ :sent_source => "sup://sent",
+ :archive_sent => true,
+ :poll_interval => 300,
+ :wrap_width => 0,
+ :slip_rows => 0,
+ :col_jump => 2
+ }
if File.exists? filename
config = Redwood::load_yaml_obj filename
abort "#{filename} is not a valid configuration file (it's a #{config.class}, not a hash)" unless config.is_a?(Hash)
- config
+ default_config.merge config
else
require 'etc'
require 'socket'
@@ -289,27 +312,8 @@ EOS
:gpgkey => ""
}
},
- :editor => ENV["EDITOR"] || "/usr/bin/vim -f -c 'setlocal spell spelllang=en_us' -c 'set filetype=mail'",
- :thread_by_subject => false,
- :edit_signature => false,
- :ask_for_from => false,
- :ask_for_to => true,
- :ask_for_cc => true,
- :ask_for_bcc => false,
- :ask_for_subject => true,
- :account_selector => true,
- :confirm_no_attachments => true,
- :confirm_top_posting => true,
- :jump_to_open_message => true,
- :discard_snippets_from_encrypted_messages => false,
- :load_more_threads_when_scrolling => true,
- :default_attachment_save_dir => "",
- :sent_source => "sup://sent",
- :poll_interval => 300,
- :wrap_width => 0,
- :slip_rows => 0,
- :col_jump => 2
}
+ config.merge! default_config
begin
Redwood::save_yaml_obj config, filename, false, true
rescue StandardError => e
diff --git a/lib/sup/sent.rb b/lib/sup/sent.rb
@@ -36,7 +36,7 @@ class SentLoader < MBox
def initialize
@filename = Redwood::SENT_FN
File.open(@filename, "w") { } unless File.exists? @filename
- super "mbox://" + @filename, true, true
+ super "mbox://" + @filename, true, $config[:archive_sent]
end
def file_path; @filename end