# HG changeset patch # User Bram Moolenaar # Date 1687803302 -7200 # Node ID bf6720206d5859e1e7cfc22631bdffbb7bc4ef04 # Parent be673a3a79f31d8976a0a52515e9e8e7d3c61b7c patch 9.0.1667: regression test doesn't fail when fix is reverted Commit: https://github.com/vim/vim/commit/e42989374144a63d986b878618aeac328e35ac3b Author: zeertzjq Date: Mon Jun 26 19:02:43 2023 +0100 patch 9.0.1667: regression test doesn't fail when fix is reverted Problem: Regression test doesn't fail when fix is reverted. Solution: Add "n" to 'cpoptions' instead of using :winsize. (closes https://github.com/vim/vim/issues/12587, issue #12528) diff --git a/src/testdir/dumps/Test_smoothscroll_zero_bot.dump b/src/testdir/dumps/Test_smoothscroll_zero_bot.dump --- a/src/testdir/dumps/Test_smoothscroll_zero_bot.dump +++ b/src/testdir/dumps/Test_smoothscroll_zero_bot.dump @@ -1,19 +1,19 @@ -| +0#af5f00255#ffffff0||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 -|@+0#4040ff13&||+1#0000000&| +0&&@9 ->@+0#4040ff13&||+1#0000000&| +0&&@9 -|<+3&&| |<+1&&|a|m|e|]| |[|+|]| -| +0&&@11 +| +0#af5f00255#ffffff0||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +|@+0#4040ff13&||+1#0000000&| +0&&@72 +>@+0#4040ff13&||+1#0000000&| +0&&@72 +|<+3&&| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @59 +| +0&&@74 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 @@ -840,7 +840,7 @@ func Test_smoothscroll_zero_width_scroll let lines =<< trim END silent normal yy silent normal 19p - winsize 0 19 + set cpoptions+=n vsplit vertical resize 0 set foldcolumn=1 @@ -849,9 +849,7 @@ func Test_smoothscroll_zero_width_scroll silent normal 20G END call writefile(lines, 'XSmoothScrollZeroBot', 'D') - let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19, wait_for_ruler: 0}) - call TermWait(buf, 1000) - + let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19}) call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot', {}) call StopVimInTerminal(buf) 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 */ /**/ + 1667, +/**/ 1666, /**/ 1665,