procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eli Zaretskii 2018-03-13 20:00:54 +02:00
parent 9f8e7712d9
commit 06911714ef
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xdisp.c
View file

@ -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