mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-19 10:22:27 +00:00
Code Issues Releases Activity

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

Browse Source 
background color if it doesn't have a Pixmap.
This commit is contained in:
Gerd Moellmann 2001-12-28 14:47:47 +00:00
parent 60626bab46
commit 0cb8bb486a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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.

1
src/xterm.c
View File

@ -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