# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 984576373 0
# Node ID 0d387c8ca7dbd10d6920f0b40c46a8499a36dfa8
# Parent  7a809e9fc67e79719e70765a58ba7f870d676958
(highlight_trailing_whitespace): On character terminals,
skip the padding blanks inserted in extend_face_to_end_of_line,
before checking for trailing whitespace.

diff -r 7a809e9fc67e -r 0d387c8ca7db src/xdisp.c
--- a/src/xdisp.c	Wed Mar 14 13:18:05 2001 +0000
+++ b/src/xdisp.c	Wed Mar 14 13:26:13 2001 +0000
@@ -12252,11 +12252,13 @@
       struct glyph *start = row->glyphs[TEXT_AREA];
       struct glyph *glyph = start + used - 1;
 
-      /* Skip over the space glyph inserted to display the
-	 cursor at the end of a line.  */
-      if (glyph->type == CHAR_GLYPH
-	  && glyph->u.ch == ' '
-	  && INTEGERP (glyph->object))
+      /* Skip over space glyphs inserted to display the cursor at the
+	 end of a line, and for extending the face of the last glyph
+	 to the end of the line on terminals.  */
+      while (glyph >= start
+	     && glyph->type == CHAR_GLYPH
+	     && glyph->u.ch == ' '
+	     && INTEGERP (glyph->object))
 	--glyph;
 
       /* If last glyph is a space or stretch, and it's trailing