aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2025-02-03 22:26:32 +0800
committerzeertzjq <zeertzjq@outlook.com>2025-02-04 08:42:53 +0800
commitbd145a6c8398fb7a3fd037bc71c1bacaeba49584 (patch)
tree4dd83c7fc698a2e39cc2fd28e7c9f8995f8dbf39 /src/nvim/diff.c
parent4d0c6cae72716eb88d74361c49dc8baefba22c63 (diff)
downloadrneovim-bd145a6c8398fb7a3fd037bc71c1bacaeba49584.tar.gz
rneovim-bd145a6c8398fb7a3fd037bc71c1bacaeba49584.tar.bz2
rneovim-bd145a6c8398fb7a3fd037bc71c1bacaeba49584.zip
vim-patch:9.1.1027: no sanitize check when running linematch
Problem: no sanitize check when running linematch Solution: add sanitize check before applying the linematch algorithm, similar to diff_find_change() (Jonathon) closes: vim/vim#16446 https://github.com/vim/vim/commit/ca307efe486670b76563a4a287bc94dace57fb74 Co-authored-by: Jonathon <jonathonwhite@protonmail.com>
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index ee063a330e..68441f7adc 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -2127,7 +2127,8 @@ int diff_check_with_linestatus(win_T *wp, linenr_T lnum, int *linestatus)
// Useful for scrollbind calculations which need to count all the filler lines
// above the screen.
if (lnum >= wp->w_topline && lnum < wp->w_botline
- && !dp->is_linematched && diff_linematch(dp)) {
+ && !dp->is_linematched && diff_linematch(dp)
+ && diff_check_sanity(curtab, dp)) {
run_linematch_algorithm(dp);
}