From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 26 Jun 2023 18:02:43 +0000 (+0100)
Subject: patch 9.0.1667: regression test doesn't fail when fix is reverted
X-Git-Tag: v9.0.1667
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e42989374144a63d986b878618aeac328e35ac3b;p=thirdparty%2Fvim.git

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 #12587,
            issue #12528)
---

diff --git a/src/testdir/dumps/Test_smoothscroll_zero_bot.dump b/src/testdir/dumps/Test_smoothscroll_zero_bot.dump
index 179b95c6e9..c0b716fb86 100644
--- 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
index 279e547f86..81670cdd7a 100644
--- a/src/testdir/test_scroll_opt.vim
+++ b/src/testdir/test_scroll_opt.vim
@@ -840,7 +840,7 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot()
   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_cursor_bot()
       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
index 948a94800e..5c83d40294 100644
--- 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 */
+/**/
+    1667,
 /**/
     1666,
 /**/