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

Avoid infinite recursion with 'relative' line numbers display

Browse source 
* src/xdisp.c (display_count_lines_visually): Bind
'display-line-numbers' to 'relative' around 'start_display' as
well, since that can invoke 'move_it_to' internally, thus
causing infinite recursion.  (Bug#43589)
This commit is contained in:
Eli Zaretskii 2020-09-25 11:55:51 +03:00
parent 395f10cb98
commit cc8fef2bdd
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

@ -22682,10 +22682,11 @@ display_count_lines_visually (struct it *it)
SET_TEXT_POS (from, PT, PT_BYTE); SET_TEXT_POS (from, PT, PT_BYTE);
to = IT_CHARPOS (*it); to = IT_CHARPOS (*it);
} }
start_display (&tem_it, it->w, from);
/* Need to disable visual mode temporarily, since otherwise the /* Need to disable visual mode temporarily, since otherwise the
call to move_it_to will cause infinite recursion. */ call to move_it_to below and inside start_display will cause
infinite recursion. */
specbind (Qdisplay_line_numbers, Qrelative); specbind (Qdisplay_line_numbers, Qrelative);
start_display (&tem_it, it->w, from);
/* Some redisplay optimizations could invoke us very far from /* Some redisplay optimizations could invoke us very far from
PT, which will make the caller painfully slow. There should PT, which will make the caller painfully slow. There should
be no need to go too far beyond the window's bottom, as any be no need to go too far beyond the window's bottom, as any