commit 6d5f4a0bed7644d5fcd442000a902ed3ae0704fe
author Milly <milly.ca@gmail.com> Tue Oct 22 23:17:45 2024 +0200
committer Christian Brabandt <cb@256bit.org> Tue Oct 22 23:17:45 2024 +0200
tree dac7a1701f7f345bd837ed92103fa02328ccac10
parent 3e5bbb8e11758d879acf17aa6668874bfccd7e96

patch 9.1.0808: Terminal scrollback doesn't shrink when decreasing 'termwinscroll'

Problem:  Terminal scrollback doesn't shrink when reducing
          'termwinscroll'
Solution: Check if option value was decreased (Milly).

closes: #15904

Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/testdir/gen_opt_test.vim

diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 1c231f9..34fffef 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -103,6 +103,7 @@
       \ 'sidescroll': [[0, 1, 8, 999], [-1]],
       \ 'sidescrolloff': [[0, 1, 8, 999], [-1]],
       \ 'tabstop': [[1, 4, 8, 12, 9999], [-1, 0, 10000]],
+      \ 'termwinscroll': [[1, 100, 99999], [-1, 0]],
       \ 'textwidth': [[0, 1, 8, 99], [-1]],
       \ 'timeoutlen': [[0, 8, 99999], [-1]],
       \ 'titlelen': [[0, 1, 8, 9999], [-1]],

src/testdir/test_options.vim

diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index cbc84a4..73e6d85 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -752,6 +752,9 @@
   call assert_fails('set tabstop=10000', 'E474:')
   call assert_fails('let &tabstop = 10000', 'E474:')
   call assert_fails('set tabstop=5500000000', 'E474:')
+  if has('terminal')
+    call assert_fails('set termwinscroll=-1', 'E487:')
+  endif
   call assert_fails('set textwidth=-1', 'E487:')
   call assert_fails('set timeoutlen=-1', 'E487:')
   call assert_fails('set updatecount=-1', 'E487:')

src/testdir/test_terminal.vim

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index fa644d3..5343efb 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -501,6 +501,21 @@
   let lines = line('$')
   call assert_inrange(91, 100, lines)
 
+  " When 'termwinscroll' becomes small, the scrollback should become small.
+  set termwinscroll=20
+  call term_sendkeys(buf, "echo set20\<CR>")
+  call WaitForAssert({-> assert_true([term_getline(buf, rows - 1), term_getline(buf, rows - 2)]->index('set20') >= 0)})
+  let lines = line('$')
+  call assert_inrange(19, 20, lines)
+
+  " When 'termwinscroll' under 10 which means 10% of it will be 0,
+  " the scrollback should become small.
+  set termwinscroll=1
+  call term_sendkeys(buf, "echo set1\<CR>")
+  call WaitForAssert({-> assert_true([term_getline(buf, rows - 1), term_getline(buf, rows - 2)]->index('set1') >= 0)})
+  let lines = line('$')
+  call assert_inrange(1, 2, lines)
+
   call StopShellInTerminal(buf)
   exe buf . 'bwipe'
   set termwinscroll&