# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 999018691 0
# Node ID e008ccec0cadd345a965cca1cd934c4989cb0706
# Parent  d13c2139752b5faeae08c83ab6f21ae238fd79ba
(x_set_glyph_string_background_width)
(show_mouse_face): Track the last changes in xterm.c.

diff -r d13c2139752b -r e008ccec0cad src/w32term.c
--- a/src/w32term.c	Tue Aug 28 17:06:36 2001 +0000
+++ b/src/w32term.c	Tue Aug 28 17:11:31 2001 +0000
@@ -4678,11 +4678,13 @@
   struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID);
   
   if (start == s->row->used[s->area]
-      && s->hl == DRAW_NORMAL_TEXT
       && s->area == TEXT_AREA
-      && (s->row->fill_line_p
-	  || s->face->background != default_face->background
-	  || s->face->stipple != default_face->stipple))
+      && ((s->hl == DRAW_NORMAL_TEXT
+	   && (s->row->fill_line_p
+	       || 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;
   
   /* If S extends its face to the end of the line, set its
@@ -7099,9 +7101,9 @@
 
       if (end_hpos > start_hpos)
         {
-          row->mouse_face_p = draw == DRAW_MOUSE_FACE;
           x_draw_glyphs (w, start_x, row, TEXT_AREA,
                          start_hpos, end_hpos, draw, NULL, NULL, 0);
+          row->mouse_face_p = draw == DRAW_MOUSE_FACE;
         }
     }