mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-08 20:58:58 +00:00
* src/xdisp.c (Fwindow_text_pixel_size): Fix last change.
(cherry picked from commit 06911714ef66ea81380b1eda75a9f7cfbc9e0b65)
This commit is contained in:
parent
f1f12d8be3
commit
ae78b14290
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user