From b40514995cf1f5fcd6cbf344cbbc648f366173bf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 13 Mar 2018 20:00:54 +0200 Subject: [PATCH] * src/xdisp.c (Fwindow_text_pixel_size): Fix last change. --- src/xdisp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index d5528714270..c0fdeca4847 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10143,14 +10143,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. */ @@ -10158,6 +10156,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 -- 2.39.2