# HG changeset patch # User Bram Moolenaar # Date 1683664205 -7200 # Node ID 1b0ade08ec91c43f5ca02b8e96ebcdfd462b6ff7 # Parent 3a28456684b0919dccb8addb0cc09f0632ba9ad9 patch 9.0.1533: test for 'smoothscroll' is ineffective Commit: https://github.com/vim/vim/commit/6f37e530d3e2d58ff055723047bf91d91af2632c Author: Luuk van Baal Date: Tue May 9 21:23:54 2023 +0100 patch 9.0.1533: test for 'smoothscroll' is ineffective Problem: Test for 'smoothscroll' is ineffective. Solution: Change the order of testing "zb" and "zt". (Luuk van Baal, closes #12366) diff --git a/src/testdir/dumps/Test_smooth_long_11.dump b/src/testdir/dumps/Test_smooth_long_11.dump --- a/src/testdir/dumps/Test_smooth_long_11.dump +++ b/src/testdir/dumps/Test_smooth_long_11.dump @@ -1,6 +1,6 @@ -|<+0#4040ff13#ffffff0@2|t+0#0000000&|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t -|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o -|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o -|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |e|n|d| @11 ->f|o|u|r| @35 -|:|s|e|t| |s|c|r|o|l@1|o| @9|4|,|1| @10|B|o|t| +>f+0&#ffffff0|o|u|r| @35 +|~+0#4040ff13&| @38 +|~| @38 +|~| @38 +|~| @38 +| +0#0000000&@21|4|,|1| @10|B|o|t| diff --git a/src/testdir/dumps/Test_smooth_long_12.dump b/src/testdir/dumps/Test_smooth_long_12.dump --- a/src/testdir/dumps/Test_smooth_long_12.dump +++ b/src/testdir/dumps/Test_smooth_long_12.dump @@ -3,4 +3,4 @@ >f|o|u|r| @35 |~+0#4040ff13&| @38 |~| @38 -|:+0#0000000&|s|e|t| |s|c|r|o|l@1|o| @9|4|,|1| @10|B|o|t| +| +0#0000000&@21|4|,|1| @10|B|o|t| diff --git a/src/testdir/dumps/Test_smooth_long_13.dump b/src/testdir/dumps/Test_smooth_long_13.dump --- a/src/testdir/dumps/Test_smooth_long_13.dump +++ b/src/testdir/dumps/Test_smooth_long_13.dump @@ -1,6 +1,6 @@ ->f+0&#ffffff0|o|u|r| @35 -|~+0#4040ff13&| @38 -|~| @38 -|~| @38 -|~| @38 -| +0#0000000&@21|4|,|1| @10|B|o|t| +|<+0#4040ff13#ffffff0@2|t+0#0000000&|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t +|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o +|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o +|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |e|n|d| @11 +>f|o|u|r| @35 +@22|4|,|1| @10|B|o|t| diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim --- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -323,11 +323,11 @@ func Test_smoothscroll_wrap_long_line() call VerifyScreenDump(buf, 'Test_smooth_long_10', {}) " Test zt/zz/zb that they work properly when a long line is above it - call term_sendkeys(buf, "zb") + call term_sendkeys(buf, "zt") call VerifyScreenDump(buf, 'Test_smooth_long_11', {}) call term_sendkeys(buf, "zz") call VerifyScreenDump(buf, 'Test_smooth_long_12', {}) - call term_sendkeys(buf, "zt") + call term_sendkeys(buf, "zb") call VerifyScreenDump(buf, 'Test_smooth_long_13', {}) " Repeat the step and move the cursor down again. diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1533, +/**/ 1532, /**/ 1531,