mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +00:00
(x_setup_relief_colors): Don't compute an image's
background color if it doesn't have a Pixmap.
This commit is contained in:
parent
60626bab46
commit
0cb8bb486a
@ -1,5 +1,8 @@
|
||||
2001-12-28 Gerd Moellmann <gerd@gnu.org>
|
||||
|
||||
* 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.
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user