aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-01 07:22:24 +0800
committerGitHub <noreply@github.com>2022-08-01 07:22:24 +0800
commit8952def50afa8308e044c0100e6d4fa367d0a9c2 (patch)
tree4c305d2f16cebd02f24a1bbf69cbaf8338bc7d4e /src/nvim/diff.c
parent68ec497d52bc8e93e12c74099ee9826b9469c3be (diff)
parent975a273125efa2f820c3e164c7ca8d05b1a24598 (diff)
downloadrneovim-8952def50afa8308e044c0100e6d4fa367d0a9c2.tar.gz
rneovim-8952def50afa8308e044c0100e6d4fa367d0a9c2.tar.bz2
rneovim-8952def50afa8308e044c0100e6d4fa367d0a9c2.zip
Merge pull request #19595 from zeertzjq/vim-9.0.0124
vim-patch:9.0.0124: code has more indent than needed
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 4ad2591802..849204f789 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -656,6 +656,7 @@ void diff_redraw(bool dofold)
if (!wp->w_p_diff || !buf_valid(wp->w_buffer)) {
continue;
}
+
redraw_later(wp, SOME_VALID);
if (wp != curwin) {
wp_other = wp;
@@ -664,8 +665,8 @@ void diff_redraw(bool dofold)
foldUpdateAll(wp);
}
- // A change may have made filler lines invalid, need to take care
- // of that for other windows.
+ // A change may have made filler lines invalid, need to take care of
+ // that for other windows.
int n = diff_check(wp, wp->w_topline);
if (((wp != curwin) && (wp->w_topfill > 0)) || (n > 0)) {
@@ -682,6 +683,7 @@ void diff_redraw(bool dofold)
check_topfill(wp, false);
}
}
+
if (wp_other != NULL && curwin->w_p_scb) {
if (used_max_fill_curwin) {
// The current window was set to use the maximum number of filler