lib/sup.rb in sup-0.16.0 vs lib/sup.rb in sup-0.17.0

- old
+ new

@@ -1,10 +1,9 @@ # encoding: utf-8 require 'rubygems' require 'yaml' -YAML::ENGINE.yamler = 'psych' require 'zlib' require 'thread' require 'fileutils' require 'locale' require 'ncursesw' @@ -331,10 +330,12 @@ :poll_interval => 300, :wrap_width => 0, :slip_rows => 0, :col_jump => 2, :stem_language => "english", - :sync_back_to_maildir => false + :sync_back_to_maildir => false, + :continuous_scroll => false, + :always_edit_async => false, } 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) default_config.merge config