X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e411be57d308435211810fd9385ac47fb95d616f..e5eb3a1ca14cf38028d076b06701792af954c90b:/settings.c

diff --git a/settings.c b/settings.c
index 93e50893..9db6fe26 100644
--- a/settings.c
+++ b/settings.c
@@ -81,7 +81,7 @@ static void gprefs(void *sesskey, char *name, char *def,
     } while (n < nvals);
     /* Add any missing values (backward compatibility ect). */
     {
-	int i, j;
+	int i;
 	for (i = 0; i < nvals; i++) {
 	    if (!(seen & 1<<mapping[i].v)) {
 		array[n] = mapping[i].v;
@@ -287,6 +287,7 @@ void load_settings(char *section, int do_host, Config * cfg)
 
     cfg->ssh_subsys = 0;	       /* FIXME: load this properly */
     cfg->remote_cmd_ptr = cfg->remote_cmd;
+    cfg->remote_cmd_ptr2 = NULL;
 
     gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
     gppi(sesskey, "PortNumber", default_port, &cfg->port);
@@ -456,7 +457,11 @@ void load_settings(char *section, int do_host, Config * cfg)
 	    cfg->wordness[j] = atoi(q);
 	}
     }
-    gpps(sesskey, "LineCodePage", "ISO-8859-1:1987", cfg->line_codepage,
+    /*
+     * The empty default for LineCodePage will be converted later
+     * into a plausible default for the locale.
+     */
+    gpps(sesskey, "LineCodePage", "", cfg->line_codepage,
 	 sizeof(cfg->line_codepage));
     gppi(sesskey, "ScrollBar", 1, &cfg->scrollbar);
     gppi(sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key);