From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 19 Mar 2001 12:35:22 +0000 (+0000)
Subject: (highlight_trailing_whitespace): Glyphs whose object
X-Git-Tag: emacs-pretest-21.0.101~265
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ade0bee1fc3198eecd99b886cd9208486854ea72;p=emacs.git

(highlight_trailing_whitespace): Glyphs whose object
is an integer don't have to be for space characters.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9253f629de2..5d006088be6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (highlight_trailing_whitespace): Glyphs whose object
+	is an integer don't have to be for space characters.
+
 2001-03-16  Gerd Moellmann  <gerd@gnu.org>
 
 	* indent.c (current_column, current_column_1, Fmove_to_column) 
diff --git a/src/xdisp.c b/src/xdisp.c
index ef54efc1975..274c133aa87 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8492,6 +8492,10 @@ redisplay_internal (preserve_echo_area)
 	      xassert (this_line_vpos == it.vpos);
 	      xassert (this_line_y == it.current_y);
 	      set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
+#if GLYPH_DEBUG
+	      *w->desired_matrix->method = 0;
+	      debug_method_add (w, "optimization 3");
+#endif
 	      goto update;
 	    }
 	  else
@@ -12252,12 +12256,12 @@ highlight_trailing_whitespace (f, row)
       struct glyph *start = row->glyphs[TEXT_AREA];
       struct glyph *glyph = start + used - 1;
 
-      /* 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.  */
+      /* Skip over glyphs inserted to display the cursor at the
+	 end of a line, for extending the face of the last glyph
+	 to the end of the line on terminals, and for truncation
+	 and continuation glyphs.  */
       while (glyph >= start
 	     && glyph->type == CHAR_GLYPH
-	     && glyph->u.ch == ' '
 	     && INTEGERP (glyph->object))
 	--glyph;