comparison src/xdisp.c @ 25197:fbe149852f1c

(set_iterator_to_next): After delivering a character from a display vector, restore face and charset to what they were before the display vector was processed.

25196:d1a0325ab7f9

    {
      /* Current display element of IT is from a display table entry.
	 Advance in the display table definition.  Reset it to null if
	 end reached, and continue with characters from buffers/
	 strings.  */
      ++it->current.dpvec_index;
      it->face_id = it->saved_face_id;
      if (it->dpvec + it->current.dpvec_index == it->dpend)
	{
	  if (it->s)
	    it->method = next_element_from_c_string;
	  else if (STRINGP (it->string))

25197:fbe149852f1c

    {
      /* Current display element of IT is from a display table entry.
	 Advance in the display table definition.  Reset it to null if
	 end reached, and continue with characters from buffers/
	 strings.  */
      struct face *face;
      
      ++it->current.dpvec_index;

      /* Restore face and charset of the iterator to what they were
	 before the display vector entry (these entries may contain
	 faces, and of course characters of different charsets).  */
      it->face_id = it->saved_face_id;
      it->charset = FACE_FROM_ID (it->f, it->face_id)->charset;
      
      if (it->dpvec + it->current.dpvec_index == it->dpend)
	{
	  if (it->s)
	    it->method = next_element_from_c_string;
	  else if (STRINGP (it->string))