diff options
| author | Gerd Moellmann | 2001-12-28 14:47:47 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-12-28 14:47:47 +0000 |
| commit | 0cb8bb486accf3657e09c4892dd3554fa856578e (patch) | |
| tree | 4db25502d0d31d3eff606fe2f641c42525fde8d3 /src/xterm.c | |
| parent | 60626bab465f140e08abbf37b7eb69a38f368fcc (diff) | |
| download | emacs-0cb8bb486accf3657e09c4892dd3554fa856578e.tar.gz emacs-0cb8bb486accf3657e09c4892dd3554fa856578e.zip | |
(x_setup_relief_colors): Don't compute an image's
background color if it doesn't have a Pixmap.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) | |||
| 3837 | if (s->face->use_box_color_for_shadows_p) | 3837 | if (s->face->use_box_color_for_shadows_p) |
| 3838 | color = s->face->box_color; | 3838 | color = s->face->box_color; |
| 3839 | else if (s->first_glyph->type == IMAGE_GLYPH | 3839 | else if (s->first_glyph->type == IMAGE_GLYPH |
| 3840 | && s->img->pixmap | ||
| 3840 | && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) | 3841 | && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) |
| 3841 | color = IMAGE_BACKGROUND (s->img, s->f, 0); | 3842 | color = IMAGE_BACKGROUND (s->img, s->f, 0); |
| 3842 | else | 3843 | else |