To: vim_dev@googlegroups.com Subject: Patch 9.0.1533 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1533 Problem: Test for 'smoothscroll' is ineffective. Solution: Change the order of testing "zb" and "zt". (Luuk van Baal, closes #12366) Files: src/testdir/test_scroll_opt.vim, src/testdir/dumps/Test_smooth_long_11.dump, src/testdir/dumps/Test_smooth_long_12.dump, src/testdir/dumps/Test_smooth_long_13.dump *** ../vim-9.0.1532/src/testdir/test_scroll_opt.vim 2023-05-08 15:50:49.194261284 +0100 --- src/testdir/test_scroll_opt.vim 2023-05-09 21:21:32.183939340 +0100 *************** *** 323,333 **** 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 VerifyScreenDump(buf, 'Test_smooth_long_11', {}) call term_sendkeys(buf, "zz") call VerifyScreenDump(buf, 'Test_smooth_long_12', {}) ! call term_sendkeys(buf, "zt") call VerifyScreenDump(buf, 'Test_smooth_long_13', {}) " Repeat the step and move the cursor down again. --- 323,333 ---- 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, "zt") call VerifyScreenDump(buf, 'Test_smooth_long_11', {}) call term_sendkeys(buf, "zz") call VerifyScreenDump(buf, 'Test_smooth_long_12', {}) ! call term_sendkeys(buf, "zb") call VerifyScreenDump(buf, 'Test_smooth_long_13', {}) " Repeat the step and move the cursor down again. *** ../vim-9.0.1532/src/testdir/dumps/Test_smooth_long_11.dump 2022-12-31 15:12:58.046637322 +0000 --- src/testdir/dumps/Test_smooth_long_11.dump 2023-05-09 21:21:32.183939340 +0100 *************** *** 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| --- 1,6 ---- ! >f+0&#ffffff0|o|u|r| @35 ! |~+0#4040ff13&| @38 ! |~| @38 ! |~| @38 ! |~| @38 ! | +0#0000000&@21|4|,|1| @10|B|o|t| *** ../vim-9.0.1532/src/testdir/dumps/Test_smooth_long_12.dump 2022-12-31 15:12:58.050637307 +0000 --- src/testdir/dumps/Test_smooth_long_12.dump 2023-05-09 21:21:32.183939340 +0100 *************** *** 3,6 **** >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| --- 3,6 ---- >f|o|u|r| @35 |~+0#4040ff13&| @38 |~| @38 ! | +0#0000000&@21|4|,|1| @10|B|o|t| *** ../vim-9.0.1532/src/testdir/dumps/Test_smooth_long_13.dump 2022-12-31 15:12:58.050637307 +0000 --- src/testdir/dumps/Test_smooth_long_13.dump 2023-05-09 21:21:32.183939340 +0100 *************** *** 1,6 **** ! >f+0&#ffffff0|o|u|r| @35 ! |~+0#4040ff13&| @38 ! |~| @38 ! |~| @38 ! |~| @38 ! | +0#0000000&@21|4|,|1| @10|B|o|t| --- 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 ! @22|4|,|1| @10|B|o|t| *** ../vim-9.0.1532/src/version.c 2023-05-09 21:15:26.401845244 +0100 --- src/version.c 2023-05-09 21:23:22.263096749 +0100 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1533, /**/ -- Far out in the uncharted backwaters of the unfashionable end of the Western Spiral arm of the Galaxy lies a small unregarded yellow sun. Orbiting this at a distance of roughly ninety-eight million miles is an utterly insignificant little blue-green planet whose ape-descended life forms are so amazingly primitive that they still think digital watches are a pretty neat idea ... -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///