From 5a25dcc5a4c73f50902432e32335ab073950cceb Mon Sep 17 00:00:00 2001 From: Jaehwang Jung Date: Sat, 12 Aug 2023 18:14:37 +0900 Subject: fix(diff): filler lines for hunks bigger than linematch limit (#24676) Apply linematch filler computation only if the hunk is actually linematched. Fixes #24580 --- src/nvim/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/diff.c') diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 64e47cbeb8..1f8d21220b 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2384,7 +2384,7 @@ void diff_set_topline(win_T *fromwin, win_T *towin) towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]); if (lnum >= dp->df_lnum[fromidx]) { - if (diff_flags & DIFF_LINEMATCH) { + if (dp->is_linematched) { calculate_topfill_and_topline(fromidx, toidx, fromwin->w_topline, fromwin->w_topfill, &towin->w_topfill, &towin->w_topline); } else { -- cgit