X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d200ba25fea891d749b0fefc257147c9b8cc5466..8eba7d3dede44be9bbb775feab8002724cb1c990:/settings.c

diff --git a/settings.c b/settings.c
index 46afb737..0d7123ab 100644
--- a/settings.c
+++ b/settings.c
@@ -309,6 +309,10 @@ void save_settings(char *section, int do_host, Config * cfg)
     write_setting_i(sesskey, "BugDeriveKey2", cfg->sshbug_derivekey2);
     write_setting_i(sesskey, "BugRSAPad2", cfg->sshbug_rsapad2);
     write_setting_i(sesskey, "BugDHGEx2", cfg->sshbug_dhgex2);
+    write_setting_i(sesskey, "StampUtmp", cfg->stamp_utmp);
+    write_setting_i(sesskey, "LoginShell", cfg->login_shell);
+    write_setting_i(sesskey, "ScrollbarOnLeft", cfg->scrollbar_on_left);
+    write_setting_s(sesskey, "BoldFont", cfg->boldfont);
     close_settings_w(sesskey);
 }
 
@@ -506,7 +510,16 @@ void load_settings(char *section, int do_host, Config * cfg)
 	    cfg->colours[i][2] = c2;
 	}
     }
+#ifndef _WINDOWS
+    /* Non-raw cut and paste of line-drawing chars works badly on the
+     * current Unix stub implementation of the Unicode functions.
+     * So I'm going to temporarily set the default to raw mode so
+     * that the failure mode isn't quite so drastically horrid.
+     * When Unicode comes in, this can all be put right. */
+    gppi(sesskey, "RawCNP", 1, &cfg->rawcnp);
+#else
     gppi(sesskey, "RawCNP", 0, &cfg->rawcnp);
+#endif
     gppi(sesskey, "PasteRTF", 0, &cfg->rtf_paste);
     gppi(sesskey, "MouseIsXterm", 0, &cfg->mouse_is_xterm);
     gppi(sesskey, "RectSelect", 0, &cfg->rect_select);
@@ -592,6 +605,10 @@ void load_settings(char *section, int do_host, Config * cfg)
     gppi(sesskey, "BugDeriveKey2", BUG_AUTO, &i); cfg->sshbug_derivekey2 = i;
     gppi(sesskey, "BugRSAPad2", BUG_AUTO, &i); cfg->sshbug_rsapad2 = i;
     gppi(sesskey, "BugDHGEx2", BUG_AUTO, &i); cfg->sshbug_dhgex2 = i;
+    gppi(sesskey, "StampUtmp", 1, &cfg->stamp_utmp);
+    gppi(sesskey, "LoginShell", 1, &cfg->login_shell);
+    gppi(sesskey, "ScrollbarOnLeft", 0, &cfg->scrollbar_on_left);
+    gpps(sesskey, "BoldFont", "", cfg->boldfont, sizeof(cfg->boldfont));
 
     close_settings_r(sesskey);
 }