comparison src/xdisp.c @ 58472:5cd5cdafa9c5

(move_it_in_display_line_to, display_line): Restore saved_face_id also when truncate-lines or hscrolled.

58471:fd75a0e281c7

	      if (ITERATOR_AT_END_OF_LINE_P (it))
		{
		  result = MOVE_NEWLINE_OR_CR;
		  break;
		}
	    }
#endif /* HAVE_WINDOW_SYSTEM */
	  result = MOVE_LINE_TRUNCATED;
	  break;
	}

  /* Move over display elements that are not visible because we are
     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);

  /* Get the initial row height.  This is either the height of the
     text hscrolled, if there is any, or zero.  */
  row->ascent = it->max_ascent;
  row->height = it->max_ascent + it->max_descent;

		  if (ITERATOR_AT_END_OF_LINE_P (it))
		    {
		      row->exact_window_width_line_p = 1;
		      goto at_end_of_line;
		    }
		}
	    }
#endif /* HAVE_WINDOW_SYSTEM */

	  row->truncated_on_right_p = 1;

58472:5cd5cdafa9c5

	      if (ITERATOR_AT_END_OF_LINE_P (it))
		{
		  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;
	  break;
	}

  /* Move over display elements that are not visible because we are
     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);
      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.  */
  row->ascent = it->max_ascent;
  row->height = it->max_ascent + it->max_descent;

		  if (ITERATOR_AT_END_OF_LINE_P (it))
		    {
		      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 */

	  row->truncated_on_right_p = 1;