Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix 'window-text-pixel-size' when there's after-string at EOB

Browse source 
* src/xdisp.c (move_it_to): Fix logic of reaching TO_CHARPOS when
there's a display or overlay string(s) at EOB.  (Bug#47860)
This commit is contained in:
Eli Zaretskii 2021-04-22 13:59:08 +03:00
parent 71b14f2806
commit 7792f7b3f3
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/xdisp.c
View file

@ -10064,8 +10064,20 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos
if ((op & MOVE_TO_POS) != 0
&& (IT_CHARPOS (*it) > to_charpos
|| (IT_CHARPOS (*it) == to_charpos
/* Consider TO_CHARPOS as REACHED if we are at
EOB that ends in something other than a newline. */
&& to_charpos == ZV
&& (ZV_BYTE <= 1 || FETCH_BYTE (ZV_BYTE - 1) != '\n'))))
&& (ZV_BYTE <= 1 || FETCH_BYTE (ZV_BYTE - 1) != '\n')
/* But if we have a display or an overlay string
at EOB, keep going until we exhaust all the
characters of the string(s). */
&& (it->sp == 0
|| (STRINGP (it->string)
&& (it->current.overlay_string_index < 0
|| (it->current.overlay_string_index >= 0
&& it->current.overlay_string_index
>= it->n_overlay_strings - 1))
&& IT_STRING_CHARPOS (*it) >= it->end_charpos)))))
{
reached = 9;
goto out;