Merge from emacs--rel--22

[gnu-emacs] / src / xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index b7a5ceec495935a2f8b118b85db2d720d9564174..add712fc85b772784d4613e8b7acf2391536feff 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4331,15 +4331,13 @@ handle_single_display_spec (it, spec, object, overlay, position,
             `display' property yet.  The call to pop_it in
             set_iterator_to_next will clean this up.  */
          if (BUFFERP (object))
-           it->current.pos = start_pos;
+           *position = start_pos;
        }
       else if (CONSP (value) && EQ (XCAR (value), Qspace))
        {
          it->method = GET_FROM_STRETCH;
          it->object = value;
-         it->position = start_pos;
-         if (BUFFERP (object))
-           it->current.pos = start_pos;
+         *position = it->position = start_pos;
        }
 #ifdef HAVE_WINDOW_SYSTEM
       else
@@ -4353,8 +4351,7 @@ handle_single_display_spec (it, spec, object, overlay, position,
          /* Say that we haven't consumed the characters with
             `display' property yet.  The call to pop_it in
             set_iterator_to_next will clean this up.  */
-         if (BUFFERP (object))
-           it->current.pos = start_pos;
+         *position = start_pos;
        }
 #endif /* HAVE_WINDOW_SYSTEM */