(highlight_trailing_whitespace): On character terminals,

skip the padding blanks inserted in extend_face_to_end_of_line,
before checking for trailing whitespace.

2 files changed, 13 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a111f026a1..10059497ecc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,12 @@
         * xterm.c (x_draw_glyph_string_box): Don't draw a full-width
         box just because the glyph row's full_width_p flag is set.
 
+2001-03-14  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * xdisp.c (highlight_trailing_whitespace): On character terminals,
+        skip the padding blanks inserted in extend_face_to_end_of_line,
+        before checking for trailing whitespace.
+
 2001-03-13  Gerd Moellmann  <gerd@gnu.org>
 
         * xmenu.c (popup_activate_callback, popup_deactivate_callback): 
diff --git a/src/xdisp.c b/src/xdisp.c
index 314ba0ac06f..ef54efc1975 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12252,11 +12252,13 @@ highlight_trailing_whitespace (f, row)
       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