From 0cb8bb486accf3657e09c4892dd3554fa856578e Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 28 Dec 2001 14:47:47 +0000 Subject: [PATCH] (x_setup_relief_colors): Don't compute an image's background color if it doesn't have a Pixmap. --- src/ChangeLog | 5 ++++- src/xterm.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index f811a4e2dde..aa598372946 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-12-28 Gerd Moellmann + * xterm.c (x_setup_relief_colors): Don't compute an image's + background color if it doesn't have a Pixmap. + * xterm.c (notice_overwritten_cursor): Don't depend on output_cursor and updated_area. Compare pixel coordinates with window's cursor pixel coordinates. @@ -7,7 +10,7 @@ notice_overwritten_cursor with new arg list. (show_mouse_face): Fix bug setting a row's mouse_face_p flag unconditionally. - + * xdisp.c (try_scrolling) : Add the height of the cursor line to the amount to scroll. diff --git a/src/xterm.c b/src/xterm.c index fd2964e4624..f7a65943780 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -3837,6 +3837,7 @@ x_setup_relief_colors (s) if (s->face->use_box_color_for_shadows_p) color = s->face->box_color; else if (s->first_glyph->type == IMAGE_GLYPH + && s->img->pixmap && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) color = IMAGE_BACKGROUND (s->img, s->f, 0); else -- 2.39.2