(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.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 4dc594955c5..28a6299836a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3459,8 +3459,16 @@ set_iterator_to_next (it)
          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)