diff options
author | Luuk van Baal <luukvbaal@gmail.com> | 2023-05-09 21:23:54 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-05-09 21:23:54 +0100 |
commit | 6f37e530d3e2d58ff055723047bf91d91af2632c (patch) | |
tree | 3c4f09dd730f47301c348db289fb15139af3703f | |
parent | ab9a2d884b3a4abe319606ea95a5a6d6b01cd73a (diff) |
patch 9.0.1533: test for 'smoothscroll' is ineffectivev9.0.1533
Problem: Test for 'smoothscroll' is ineffective.
Solution: Change the order of testing "zb" and "zt". (Luuk van Baal,
closes #12366)
-rw-r--r-- | src/testdir/dumps/Test_smooth_long_11.dump | 12 | ||||
-rw-r--r-- | src/testdir/dumps/Test_smooth_long_12.dump | 2 | ||||
-rw-r--r-- | src/testdir/dumps/Test_smooth_long_13.dump | 12 | ||||
-rw-r--r-- | src/testdir/test_scroll_opt.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 17 insertions, 15 deletions
diff --git a/src/testdir/dumps/Test_smooth_long_11.dump b/src/testdir/dumps/Test_smooth_long_11.dump index 0aa7a4bee2..62d7992820 100644 --- 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 index 10634be6c9..7a1245ef0d 100644 --- 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 index 62d7992820..7f5bff746c 100644 --- 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 index 5f6fefeee7..62469def1b 100644 --- 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 index 3fb73b25ea..97530bfa8c 100644 --- 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, |