aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/drawscreen.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-05-07 07:04:49 +0800
committerGitHub <noreply@github.com>2023-05-07 07:04:49 +0800
commit408a7c2dac2d0d305cb59350cb44ca0864087657 (patch)
tree41669bcc6b033b7a0a8a47ced20690782a1dffbd /src/nvim/drawscreen.c
parent1bf29a0ae1fffee8a009dfbc8da2d7c048f6eb20 (diff)
parent8e74569d7ee170b8661bdc74d61cf6be95303060 (diff)
downloadrneovim-408a7c2dac2d0d305cb59350cb44ca0864087657.tar.gz
rneovim-408a7c2dac2d0d305cb59350cb44ca0864087657.tar.bz2
rneovim-408a7c2dac2d0d305cb59350cb44ca0864087657.zip
Merge pull request #23510 from luukvbaal/smoothscroll
vim-patch:9.0.{1512,1513}
Diffstat (limited to 'src/nvim/drawscreen.c')
-rw-r--r--src/nvim/drawscreen.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index ec5163f37a..7f7c721379 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -2101,7 +2101,12 @@ static void win_update(win_T *wp, DecorProviders *providers)
if (hasFoldingWin(wp, l, NULL, &l, true, NULL)) {
new_rows++;
} else if (l == wp->w_topline) {
- new_rows += plines_win_nofill(wp, l, true) + wp->w_topfill;
+ int n = plines_win_nofill(wp, l, false) + wp->w_topfill;
+ n = adjust_plines_for_skipcol(wp, n);
+ if (n > wp->w_height_inner) {
+ n = wp->w_height_inner;
+ }
+ new_rows += n;
} else {
new_rows += plines_win(wp, l, true);
}