(x_setup_relief_colors): Don't compute an image's

background color if it doesn't have a Pixmap.

diff --git a/src/ChangeLog b/src/ChangeLog
index f811a4e2dde11a4d5331ef33871f36f4aa765c98..aa5983729467454b47c2ff500765741117aad09b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
@@ -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) <PT below scroll margin>: Add the
        height of the cursor line to the amount to scroll.
 

diff --git a/src/xterm.c b/src/xterm.c
index fd2964e462444ebed25737173537a8f9012b53f9..f7a6594378016f35f82d47f09ca3345f9cc3f4ba 100644 (file)
--- 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