Oops - check in leftovers from yesterday's development. That's what

I get for running most of my cvs commands in the unix subdir :-/

[originally from svn r2078]

diff --git a/putty.h b/putty.h
index c5a08b18c44dd7cb427b5a7a442b314752dd0174..9d00154246e53831beb8eb151e23a8a6e678df8e 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -372,6 +372,8 @@ struct config_tag {
     /* Options for pterm. Should split out into platform-dependent part. */
     int stamp_utmp;
     int login_shell;
+    int scrollbar_on_left;
+    char boldfont[64];
 };
 
 /*

diff --git a/settings.c b/settings.c
index 41127b89ace8f980df762f3aef86e61a7199c83c..98847decbd7888a72fc53b7717091392f0356011 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -311,6 +311,7 @@ void save_settings(char *section, int do_host, Config * cfg)
     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);
     close_settings_w(sesskey);
 }
 
@@ -596,6 +597,7 @@ void load_settings(char *section, int do_host, Config * cfg)
     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);
 
     close_settings_r(sesskey);
 }

diff --git a/terminal.c b/terminal.c
index de6a2e933cf8adf8a8df25ee590c16816d034023..b0ad356575fc5aa2e79682da8209b463c70eee06 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1133,7 +1133,6 @@ void term_out(void)
                else
                    print_state = 0;
                if (print_state == 4) {
-                   printing = only_printing = FALSE;
                    term_print_finish();
                }
                continue;
@@ -1915,8 +1914,6 @@ void term_out(void)
                                print_state = 0;
                                term_print_setup();
                            } else if (esc_args[0] == 4 && printing) {
-                               printing = FALSE;
-                               only_printing = FALSE;
                                term_print_finish();
                            }
                        }