Merge branch 'master' into stabber-tests

2015-06-02 20:32:15 +01:00
parent f278e0a466 f0f3a739f4
commit 78a4446023
13 changed files with 60 additions and 13 deletions
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -431,6 +431,7 @@ _load_preferences(void)
    _set_boolean_preference("flash", PREF_FLASH);
    _set_boolean_preference("splash", PREF_SPLASH);
    _set_boolean_preference("wrap", PREF_WRAP);
+    _set_boolean_preference("wins.autotidy", PREF_WINS_AUTO_TIDY);
    _set_string_preference("time", PREF_TIME);
    _set_string_preference("time.statusbar", PREF_TIME_STATUSBAR);