Mon Apr 29 21:18:20 2002 Michael Jennings (mej)

Fixed the --install option which hasn't worked for ages.


SVN revision: 6193
This commit is contained in:
Michael Jennings 2002-04-30 01:19:33 +00:00
parent c9ef7c9002
commit 43bd347fbb
3 changed files with 7 additions and 4 deletions

View File

@ -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.
----------------------------------------------------------------------

View File

@ -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

View File

@ -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;
}