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

Another fix for scroll-conservatively and overlay strings

Browse source 
* src/xdisp.c (redisplay_window): Handle also the case where the
calculated window-start point has an overlay string touching it.
(Bug#24179)
This commit is contained in:
Eli Zaretskii 2016-08-14 21:25:52 +03:00
parent 59720dc137
commit 7aaeb86f8c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xdisp.c
View file

@ -16957,7 +16957,8 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
try_window (window, it.current.pos, 0);
}
else if (scroll_conservatively > SCROLL_LIMIT
&& it.method == GET_FROM_STRING
&& (it.method == GET_FROM_STRING
|| overlay_touches_p (IT_CHARPOS (it)))
&& IT_CHARPOS (it) < ZV)
{
/* If the window starts with a before-string that spans more
@ -16973,7 +16974,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
clear_glyph_matrix (w->desired_matrix);
do {
move_it_by_lines (&it, 1);
} while (IT_CHARPOS (it) == pos0 && it.method == GET_FROM_STRING);
} while (IT_CHARPOS (it) == pos0);
try_window (window, it.current.pos, 0);
}
else