# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1101295786 0
# Node ID 5cd5cdafa9c5db8946599eac5ac7e5162a1ac763
# Parent  fd75a0e281c7b169d4ed5b3a1636aec7f0bcd59e
(move_it_in_display_line_to, display_line):
Restore saved_face_id also when truncate-lines or hscrolled.

diff -r fd75a0e281c7 -r 5cd5cdafa9c5 src/xdisp.c
--- a/src/xdisp.c	Wed Nov 24 11:29:27 2004 +0000
+++ b/src/xdisp.c	Wed Nov 24 11:29:46 2004 +0000
@@ -5862,6 +5862,8 @@
 		  result = MOVE_NEWLINE_OR_CR;
 		  break;
 		}
+	      if (it->method == next_element_from_display_vector)
+		it->face_id = it->saved_face_id;
 	    }
 #endif /* HAVE_WINDOW_SYSTEM */
 	  result = MOVE_LINE_TRUNCATED;
@@ -14628,8 +14630,12 @@
      hscrolled.  This may stop at an x-position < IT->first_visible_x
      if the first glyph is partially visible or if we hit a line end.  */
   if (it->current_x < it->first_visible_x)
-    move_it_in_display_line_to (it, ZV, it->first_visible_x,
-				MOVE_TO_POS | MOVE_TO_X);
+    {
+      move_it_in_display_line_to (it, ZV, it->first_visible_x,
+				  MOVE_TO_POS | MOVE_TO_X);
+      if (it->method == next_element_from_display_vector)
+	it->face_id = it->saved_face_id;
+    }
 
   /* Get the initial row height.  This is either the height of the
      text hscrolled, if there is any, or zero.  */
@@ -14970,6 +14976,8 @@
 		      row->exact_window_width_line_p = 1;
 		      goto at_end_of_line;
 		    }
+		  if (it->method == next_element_from_display_vector)
+		    it->face_id = it->saved_face_id;
 		}
 	    }
 #endif /* HAVE_WINDOW_SYSTEM */