mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

Fix a typo in 'window_text_pixel_size'

Browse source 
This typo caused strange mis-behaviors in buffers
with non-ASCII characters.
* src/xdisp.c (window_text_pixel_size): Fix typo.  (Bug#76519)
This commit is contained in:
Eli Zaretskii 2025-02-24 21:02:14 +02:00
parent 8a8c25eacc
commit 0c6b8643ae
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/xdisp.c
View file

@ -11546,6 +11546,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to,
it.bidi_p = false; it.bidi_p = false;
int start_x; int start_x;
ptrdiff_t start_bpos = BYTEPOS (startp);
if (vertical_offset != 0) if (vertical_offset != 0)
{ {
int last_y; int last_y;
@ -11578,6 +11579,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to,
it.current_y = (WINDOW_TAB_LINE_HEIGHT (w) it.current_y = (WINDOW_TAB_LINE_HEIGHT (w)
+ WINDOW_HEADER_LINE_HEIGHT (w)); + WINDOW_HEADER_LINE_HEIGHT (w));
start = clip_to_bounds (BEGV, IT_CHARPOS (it), ZV); start = clip_to_bounds (BEGV, IT_CHARPOS (it), ZV);
start_bpos = CHAR_TO_BYTE (start);
start_y = it.current_y; start_y = it.current_y;
start_x = it.current_x; start_x = it.current_x;
} }
@ -11639,7 +11641,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to,
it.current_y = start_y; it.current_y = start_y;
/* If FROM is on a newline, pretend that we start at the beginning /* If FROM is on a newline, pretend that we start at the beginning
of the next line, because the newline takes no place on display. */ of the next line, because the newline takes no place on display. */
if (FETCH_BYTE (start) == '\n') if (FETCH_BYTE (start_bpos) == '\n')
it.current_x = 0, it.wrap_prefix_width = 0; it.current_x = 0, it.wrap_prefix_width = 0;
if (!NILP (x_limit)) if (!NILP (x_limit))
{ {