Merge branch 'master' into openpgp

2015-06-02 20:32:07 +01:00
parent 06fe9bec37 f0f3a739f4
commit a3693cfbe7
13 changed files with 60 additions and 13 deletions
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -875,6 +875,15 @@ cons_wrap_setting(void)
        cons_show("Word wrap (/wrap)             : OFF");
 }

+void
+cons_winstidy_setting(void)
+{
+    if (prefs_get_boolean(PREF_WINS_AUTO_TIDY))
+        cons_show("Window Auto Tidy (/winstidy)  : ON");
+    else
+        cons_show("Window Auto Tidy (/winstidy)  : OFF");
+}
+
 void
 cons_presence_setting(void)
 {
@@ -1039,6 +1048,7 @@ cons_show_ui_prefs(void)
    cons_flash_setting();
    cons_splash_setting();
    cons_wrap_setting();
+    cons_winstidy_setting();
    cons_time_setting();
    cons_resource_setting();
    cons_vercheck_setting();