From 3b2bd8d69e6c0a173562778fae6ece67d9adf52c Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 6 May 2023 17:33:42 +0200
Subject: vim-patch:9.0.1512: inserting lines when scrolling with
 'smoothscroll' set

Problem:    Inserting lines when scrolling with 'smoothscroll' set.
Solution:   Adjust line height computation for w_skipcol. (Luuk van Baal,
            closes vim/vim#12350)

https://github.com/vim/vim/commit/c8502f9b880b6d23baa4f9d28b60e1ceb442e35f
---
 src/nvim/drawscreen.c | 7 ++++++-
 src/nvim/move.c       | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

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);
             }
diff --git a/src/nvim/move.c b/src/nvim/move.c
index c93c94f8c5..e09a95af70 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -58,7 +58,7 @@ typedef struct {
 #endif
 
 /// Reduce "n" for the screen lines skipped with "wp->w_skipcol".
-static int adjust_plines_for_skipcol(win_T *wp, int n)
+int adjust_plines_for_skipcol(win_T *wp, int n)
 {
   if (wp->w_skipcol == 0) {
     return n;
@@ -196,7 +196,7 @@ static int skipcol_from_plines(win_T *wp, int plines_off)
   return skipcol;
 }
 
-/// Set wp->s_skipcol to zero and redraw later if needed.
+/// Set wp->w_skipcol to zero and redraw later if needed.
 static void reset_skipcol(win_T *wp)
 {
   if (wp->w_skipcol != 0) {
@@ -2267,7 +2267,7 @@ void cursor_correct(void)
   }
 
   if (curwin->w_p_sms && !curwin->w_p_wrap) {
-    // 'smoothscroll is active
+    // 'smoothscroll' is active
     if (curwin->w_cline_height == curwin->w_height_inner) {
       // The cursor line just fits in the window, don't scroll.
       reset_skipcol(curwin);
-- 
cgit