From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Wed, 16 Oct 2002 09:28:17 +0000 (+0000)
Subject: Oops - check in leftovers from yesterday's development. That's what
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/239b3b3629cc9e149dbc375ae2c42dc6d4f35c49

Oops - check in leftovers from yesterday's development. That's what
I get for running most of my cvs commands in the unix subdir :-/


git-svn-id: svn://svn.tartarus.org/sgt/putty@2078 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/putty.h b/putty.h
index c5a08b18..9d001542 100644
--- 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 41127b89..98847dec 100644
--- 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 de6a2e93..b0ad3565 100644
--- 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();
 			    }
 			}