From 43bd347fbb16d1befe4858389ff7a76f1ecc6dbc Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Tue, 30 Apr 2002 01:19:33 +0000 Subject: [PATCH] Mon Apr 29 21:18:20 2002 Michael Jennings (mej) Fixed the --install option which hasn't worked for ages. SVN revision: 6193 --- ChangeLog | 4 ++++ src/options.c | 3 +-- src/windows.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e460ab..d964e6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4620,3 +4620,7 @@ Mon Apr 29 10:48:33 2002 Michael Jennings (mej) Disable the screen dump escape sequence and implement a save_buff() script function instead. ---------------------------------------------------------------------- +Mon Apr 29 21:18:20 2002 Michael Jennings (mej) + +Fixed the --install option which hasn't worked for ages. +---------------------------------------------------------------------- diff --git a/src/options.c b/src/options.c index 3d5139f..4c405ec 100644 --- a/src/options.c +++ b/src/options.c @@ -92,7 +92,7 @@ static char *rs_multichar_encoding = NULL; static char *rs_greek_keyboard = NULL; #endif -unsigned long Options = (Opt_scrollbar), image_toggles = 0; +unsigned long Options = (Opt_scrollbar | Opt_select_trailing_spaces), image_toggles = 0; char *theme_dir = NULL, *user_dir = NULL; char **rs_exec_args = NULL; /* Args to exec (-e or --exec) */ char *rs_title = NULL; /* Window title */ @@ -2740,7 +2740,6 @@ init_defaults(void) } #endif - Options = (Opt_scrollbar | Opt_select_trailing_spaces); Xdisplay = NULL; rs_term_name = NULL; #ifdef CUTCHAR_OPTION diff --git a/src/windows.c b/src/windows.c index f9679ac..e2bd151 100644 --- a/src/windows.c +++ b/src/windows.c @@ -93,10 +93,10 @@ get_tint_by_color_name(const char *color) unsigned long r, g, b, t; wcol.pixel = WhitePixel(Xdisplay, Xscreen); - XQueryColor(Xdisplay, Xcmap, &wcol); + XQueryColor(Xdisplay, cmap, &wcol); D_PIXMAP(("Tint string is \"%s\", white color is rgbi:%d/%d/%d\n", color, wcol.red, wcol.green, wcol.blue)); - if (!XParseColor(Xdisplay, Xcmap, color, &xcol)) { + if (!XParseColor(Xdisplay, cmap, color, &xcol)) { print_error("Unable to parse tint color \"%s\". Ignoring.\n", color); return 0xffffff; }