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
index 0aa7a4bee2004950c5a020dda6e3bd048c833564..62d799282050acb8e27afeb2265423d02b9aec3b 100644 (file)
--- 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 10634be6c93ad71349b6c254d1acbbe33ba8a723..7a1245ef0dc437a57e7aa56bd1084e6d0bea2eb2 100644 (file)
--- 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 62d799282050acb8e27afeb2265423d02b9aec3b..7f5bff746cfc0c0c36689f58879a25c8015a2acc 100644 (file)
--- 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 5f6fefeee7d072af479b4303e32610b0c13701a8..62469def1be544809e4b2cf7cce561bcdf1a9642 100644 (file)
--- 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 3fb73b25ea33732f47bb47d7439c882b877b3724..97530bfa8c977a755d29563327994e4c7e3a575d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1533,
 /**/
     1532,
 /**/