diff options
| author | Jaehwang Jung <tomtomjhj@gmail.com> | 2023-08-12 18:14:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 17:14:37 +0800 |
| commit | 5a25dcc5a4c73f50902432e32335ab073950cceb (patch) | |
| tree | 5e99071e91b1235497bb17810d2c8051644a7742 /src/nvim/diff.c | |
| parent | 04aed08157e324669f70fb0e90be38722332b3e1 (diff) | |
| download | rneovim-5a25dcc5a4c73f50902432e32335ab073950cceb.tar.gz rneovim-5a25dcc5a4c73f50902432e32335ab073950cceb.tar.bz2 rneovim-5a25dcc5a4c73f50902432e32335ab073950cceb.zip | |
fix(diff): filler lines for hunks bigger than linematch limit (#24676)
Apply linematch filler computation only if the hunk is actually
linematched.
Fixes #24580
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |