From 7490dda30241dc01cae140ceef06817e81eb5cd1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 21 Mar 2025 18:20:21 +0200 Subject: [PATCH] Avoid infinite loop with images under 'display-line-numbers-mode' * src/xdisp.c (move_it_in_display_line_to, display_line): When considering the first glyph on a glyph row, take into consideration the glyphs produced for line-number display. (Bug#77065) (cherry picked from commit df6669578001e49f44714301df71870654a2de33) --- src/xdisp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 00a7c503786..5845f941a8f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10295,10 +10295,10 @@ move_it_in_display_line_to (struct it *it, { bool moved_forward = false; - if (/* IT->hpos == 0 means the very first glyph - doesn't fit on the line, e.g. a wide - image. */ - it->hpos == 0 + if (/* IT->hpos == 0 (modulo line-number width) means + the very first glyph doesn't fit on the line, + e.g., a wide image. */ + it->hpos == 0 + (it->lnum_width ? it->lnum_width + 2 : 0) || (new_x == it->last_visible_x && FRAME_WINDOW_P (it->f))) { @@ -25842,7 +25842,7 @@ display_line (struct it *it, int cursor_vpos) { /* End of a continued line. */ - if (it->hpos == 0 + if (it->hpos == 0 + (it->lnum_width ? it->lnum_width + 2 : 0) || (new_x == it->last_visible_x && FRAME_WINDOW_P (it->f) && (row->reversed_p -- 2.39.5