From fc908b500683215085ee6c12b41aa227332b7bbe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 6 Jun 2023 06:34:02 +0800
Subject: vim-patch:9.0.1610: display is wrong when 'smoothscroll' is set

Problem:    Display is wrong when 'smoothscroll' is set and scrolling multiple
            lines.
Solution:   Redraw with UPD_NOT_VALID when "skipcol" is or was set.
            (closes vim/vim#12490, closes vim/vim#12468)

https://github.com/vim/vim/commit/d9a92dc70b20c76cef9ca186676583c92c14311c
---
 test/functional/legacy/scroll_opt_spec.lua | 24 +++++++++++++++++++-----
 test/old/testdir/test_scroll_opt.vim       | 10 +++++++---
 2 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua
index bb0ada15e9..a5a6aded79 100644
--- a/test/functional/legacy/scroll_opt_spec.lua
+++ b/test/functional/legacy/scroll_opt_spec.lua
@@ -874,10 +874,11 @@ describe('smoothscroll', function()
     })
     exec([[
       setlocal cursorline scrolloff=0 smoothscroll
-      call setline(1, repeat([''], 9))
+      call setline(1, repeat([''], 8))
       call setline(3, repeat('a', 50))
-      call setline(8, 'bbb')
-      call setline(9, 'ccc')
+      call setline(4, repeat('a', 50))
+      call setline(7, 'bbb')
+      call setline(8, 'ccc')
       redraw
     ]])
     screen:expect([[
@@ -885,8 +886,8 @@ describe('smoothscroll', function()
                                               |
       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
       aaaaaaaaaa                              |
-                                              |
-                                              |
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      aaaaaaaaaa                              |
                                               |
                                               |
       bbb                                     |
@@ -895,13 +896,26 @@ describe('smoothscroll', function()
     feed('3<C-E>')
     screen:expect([[
       {0:<<<}{1:aaaaaa^a                              }|
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
+      aaaaaaaaaa                              |
                                               |
                                               |
+      bbb                                     |
+      ccc                                     |
+      {0:~                                       }|
+      {0:~                                       }|
+                                              |
+    ]])
+    feed('2<C-E>')
+    screen:expect([[
+      {0:<<<}{1:aaaaaa^a                              }|
                                               |
                                               |
       bbb                                     |
       ccc                                     |
       {0:~                                       }|
+      {0:~                                       }|
+      {0:~                                       }|
       {0:~                                       }|
                                               |
     ]])
diff --git a/test/old/testdir/test_scroll_opt.vim b/test/old/testdir/test_scroll_opt.vim
index 1cd8bbfc84..f9f33b20eb 100644
--- a/test/old/testdir/test_scroll_opt.vim
+++ b/test/old/testdir/test_scroll_opt.vim
@@ -801,10 +801,11 @@ func Test_smoothscroll_multi_skipcol()
 
   let lines =<< trim END
       setlocal cursorline scrolloff=0 smoothscroll
-      call setline(1, repeat([''], 9))
+      call setline(1, repeat([''], 8))
       call setline(3, repeat('a', 50))
-      call setline(8, 'bbb')
-      call setline(9, 'ccc')
+      call setline(4, repeat('a', 50))
+      call setline(7, 'bbb')
+      call setline(8, 'ccc')
       redraw
   END
   call writefile(lines, 'XSmoothMultiSkipcol', 'D')
@@ -814,6 +815,9 @@ func Test_smoothscroll_multi_skipcol()
   call term_sendkeys(buf, "3\<C-E>")
   call VerifyScreenDump(buf, 'Test_smooth_multi_skipcol_2', {})
 
+  call term_sendkeys(buf, "2\<C-E>")
+  call VerifyScreenDump(buf, 'Test_smooth_multi_skipcol_3', {})
+
   call StopVimInTerminal(buf)
 endfunc
 
-- 
cgit