diff options
| author | Eli Zaretskii | 2020-09-25 11:55:51 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-09-25 11:55:51 +0300 |
| commit | cc8fef2bddfcf4e1c3bab35a18621dd7666d022e (patch) | |
| tree | 8f022dfad75b8298d05b2bb17fb9943b3137494b /src | |
| parent | 395f10cb98af122404bcdc2eb60d30decf297625 (diff) | |
| download | emacs-cc8fef2bddfcf4e1c3bab35a18621dd7666d022e.tar.gz emacs-cc8fef2bddfcf4e1c3bab35a18621dd7666d022e.zip | |
Avoid infinite recursion with 'relative' line numbers display
* 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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index d191ef51700..2af6144975a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -22682,10 +22682,11 @@ display_count_lines_visually (struct it *it) | |||
| 22682 | SET_TEXT_POS (from, PT, PT_BYTE); | 22682 | SET_TEXT_POS (from, PT, PT_BYTE); |
| 22683 | to = IT_CHARPOS (*it); | 22683 | to = IT_CHARPOS (*it); |
| 22684 | } | 22684 | } |
| 22685 | start_display (&tem_it, it->w, from); | ||
| 22686 | /* Need to disable visual mode temporarily, since otherwise the | 22685 | /* Need to disable visual mode temporarily, since otherwise the |
| 22687 | call to move_it_to will cause infinite recursion. */ | 22686 | call to move_it_to below and inside start_display will cause |
| 22687 | infinite recursion. */ | ||
| 22688 | specbind (Qdisplay_line_numbers, Qrelative); | 22688 | specbind (Qdisplay_line_numbers, Qrelative); |
| 22689 | start_display (&tem_it, it->w, from); | ||
| 22689 | /* Some redisplay optimizations could invoke us very far from | 22690 | /* Some redisplay optimizations could invoke us very far from |
| 22690 | PT, which will make the caller painfully slow. There should | 22691 | PT, which will make the caller painfully slow. There should |
| 22691 | be no need to go too far beyond the window's bottom, as any | 22692 | be no need to go too far beyond the window's bottom, as any |