From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 13 Mar 2018 18:00:54 +0000 (+0200)
Subject: * src/xdisp.c (Fwindow_text_pixel_size): Fix last change.
X-Git-Tag: emacs-26.1.90~417
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae78b142901c954d16a35eaf97b312438f751bdb;p=emacs.git

* src/xdisp.c (Fwindow_text_pixel_size): Fix last change.

(cherry picked from commit 06911714ef66ea81380b1eda75a9f7cfbc9e0b65)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 419187376f5..f637dec64d0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10145,14 +10145,12 @@ include the height of both, if present, in the return value.  */)
      directionality, and regions that begin and end in text of the
      same directionality.  */
   it.bidi_p = false;
-  void *it2data = NULL;
-  struct it it2;
-  SAVE_IT (it2, it, it2data);
 
   int move_op = MOVE_TO_POS | MOVE_TO_Y;
   int to_x = -1;
   if (!NILP (x_limit))
     {
+      it.last_visible_x = max_x;
       /* Actually, we never want move_it_to stop at to_x.  But to make
 	 sure that move_it_in_display_line_to always moves far enough,
 	 we set to_x to INT_MAX and specify MOVE_TO_X.  */
@@ -10160,6 +10158,10 @@ include the height of both, if present, in the return value.  */)
       to_x = INT_MAX;
     }
 
+  void *it2data = NULL;
+  struct it it2;
+  SAVE_IT (it2, it, it2data);
+
   x = move_it_to (&it, end, to_x, max_y, -1, move_op);
 
   /* We could have a display property at END, in which case asking