From ad493ef3ea9ef7f2b0badcd2298883b5ab6e4ef4 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 29 Mar 2024 10:23:19 +0100 Subject: patch 9.1.0228: Two unrelated things are tested by a single test Problem: Two unrelated things are tested by a single test. Solution: Split it into two, restoring the old Test_brace_single_line(). Add missing cleanup to some tests. (zeertzjq) closes: #14323 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- runtime/doc/options.txt | 5 ++--- src/testdir/test_normal.vim | 23 ++++++++++++++++------- src/testdir/test_scroll_opt.vim | 8 ++++---- src/version.c | 2 ++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 4eaedc250c..806f5f0b80 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2024 Mar 28 +*options.txt* For Vim version 9.1. Last change: 2024 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7502,8 +7502,7 @@ A jump table for the options with a short description can be found at |Q_op|. highlighted with |hl-NonText|. You may also want to add "lastline" to the 'display' option to show as much of the last line as possible. - NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y, - CTRL-D, CTRL-U, CTRL-F, CTRL-B and scrolling with the mouse. + NOTE: partly implemented, doesn't work yet for |gj| and |gk|. *'softtabstop'* *'sts'* 'softtabstop' 'sts' number (default 0) diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index 3a7248fd08..14440fb692 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -4174,21 +4174,29 @@ func Test_normal34_zet_large() norm! z9765405999999999999 endfunc -" Test for { and } paragraph movements and Ctrl-B in buffer with a single line -func Test_single_line_scroll() - CheckFeature textprop - +" Test for { and } paragraph movements in a single line +func Test_brace_single_line() new call setline(1, ['foobar one two three']) - let vt = 'virt_above' - call prop_type_add(vt, {'highlight': 'IncSearch'}) - call prop_add(1, 0, {'type': vt, 'text': '---', 'text_align': 'above'}) 1 norm! 0} call assert_equal([0, 1, 20, 0], getpos('.')) norm! { call assert_equal([0, 1, 1, 0], getpos('.')) + bw! +endfunc + +" Test for Ctrl-B/Ctrl-U in buffer with a single line +func Test_single_line_scroll() + CheckFeature textprop + + new + call setline(1, ['foobar one two three']) + let vt = 'virt_above' + call prop_type_add(vt, {'highlight': 'IncSearch'}) + call prop_add(1, 0, {'type': vt, 'text': '---', 'text_align': 'above'}) + call cursor(1, 1) " Ctrl-B/Ctrl-U scroll up with hidden "above" virtual text. set smoothscroll @@ -4203,6 +4211,7 @@ func Test_single_line_scroll() set smoothscroll& bw! + call prop_type_delete(vt) endfunc " vim: shiftwidth=2 sts=2 expandtab nofoldenable diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim index 788870f876..d7a79076d1 100644 --- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -738,6 +738,7 @@ func Test_smoothscroll_mouse_pos() let &mouse = save_mouse let &term = save_term let &ttymouse = save_ttymouse + bwipe! endfunc " this was dividing by zero @@ -999,9 +1000,8 @@ func Test_smoothscroll_textoff_small_winwidth() endfunc func Test_smoothscroll_page() - set smoothscroll - - 10split | 40vsplit + call NewWindow(10, 40) + setlocal smoothscroll call setline(1, 'abcde '->repeat(150)) exe "norm! \" @@ -1038,7 +1038,7 @@ func Test_smoothscroll_page() exe "norm! \" call assert_equal(0, winsaveview().skipcol) - set smoothscroll& + bwipe! endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 7acc24d0d4..2a996a1425 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 228, /**/ 227, /**/ -- cgit v1.2.3