Mercurial > emacs

changeset 42376:0f408d016a15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_setup_relief_colors): Don't compute an image's background color if it doesn't have a Pixmap.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 28 Dec 2001 14:47:19 +0000
parents 56cc690f3c8d
children 91a13656c9c6
files src/xterm.c
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Fri Dec 28 13:34:00 2001 +0000
+++ b/src/xterm.c	Fri Dec 28 14:47:19 2001 +0000
@@ -3837,6 +3837,7 @@
   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