Commit f4fccc1e authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(x_set_glyph_string_background_width)

(show_mouse_face): Track the last changes in xterm.c.
parent 99739bbf
2001-08-28 Eli Zaretskii <eliz@is.elta.co.il>
* w32term.c (x_set_glyph_string_background_width)
(show_mouse_face): Track the last changes in xterm.c.
2001-08-28 Gerd Moellmann <gerd@gnu.org> 2001-08-28 Gerd Moellmann <gerd@gnu.org>
* xterm.c (x_set_glyph_string_background_width): Set the glyph * xterm.c (x_set_glyph_string_background_width): Set the glyph
......
...@@ -4678,11 +4678,13 @@ x_set_glyph_string_background_width (s, start, last_x) ...@@ -4678,11 +4678,13 @@ x_set_glyph_string_background_width (s, start, last_x)
struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID); struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID);
if (start == s->row->used[s->area] if (start == s->row->used[s->area]
&& s->hl == DRAW_NORMAL_TEXT
&& s->area == TEXT_AREA && s->area == TEXT_AREA
&& (s->row->fill_line_p && ((s->hl == DRAW_NORMAL_TEXT
|| s->face->background != default_face->background && (s->row->fill_line_p
|| s->face->stipple != default_face->stipple)) || s->face->background != default_face->background
|| s->face->stipple != default_face->stipple
|| s->row->mouse_face_p))
|| s->hl == DRAW_MOUSE_FACE))
s->extends_to_end_of_line_p = 1; s->extends_to_end_of_line_p = 1;
/* If S extends its face to the end of the line, set its /* If S extends its face to the end of the line, set its
...@@ -7099,9 +7101,9 @@ show_mouse_face (dpyinfo, draw) ...@@ -7099,9 +7101,9 @@ show_mouse_face (dpyinfo, draw)
if (end_hpos > start_hpos) if (end_hpos > start_hpos)
{ {
row->mouse_face_p = draw == DRAW_MOUSE_FACE;
x_draw_glyphs (w, start_x, row, TEXT_AREA, x_draw_glyphs (w, start_x, row, TEXT_AREA,
start_hpos, end_hpos, draw, NULL, NULL, 0); start_hpos, end_hpos, draw, NULL, NULL, 0);
row->mouse_face_p = draw == DRAW_MOUSE_FACE;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment