Skip to content

Commit e429893

Browse files
zeertzjqbrammool
authored andcommitted
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)
1 parent a2a90d5 commit e429893

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
| +0#af5f00255#ffffff0||+1#0000000&| +0&&@9
2-
|@+0#4040ff13&||+1#0000000&| +0&&@9
3-
|@+0#4040ff13&||+1#0000000&| +0&&@9
4-
|@+0#4040ff13&||+1#0000000&| +0&&@9
5-
|@+0#4040ff13&||+1#0000000&| +0&&@9
6-
|@+0#4040ff13&||+1#0000000&| +0&&@9
7-
|@+0#4040ff13&||+1#0000000&| +0&&@9
8-
|@+0#4040ff13&||+1#0000000&| +0&&@9
9-
|@+0#4040ff13&||+1#0000000&| +0&&@9
10-
|@+0#4040ff13&||+1#0000000&| +0&&@9
11-
|@+0#4040ff13&||+1#0000000&| +0&&@9
12-
|@+0#4040ff13&||+1#0000000&| +0&&@9
13-
|@+0#4040ff13&||+1#0000000&| +0&&@9
14-
|@+0#4040ff13&||+1#0000000&| +0&&@9
15-
|@+0#4040ff13&||+1#0000000&| +0&&@9
16-
|@+0#4040ff13&||+1#0000000&| +0&&@9
17-
>@+0#4040ff13&||+1#0000000&| +0&&@9
18-
|<+3&&| |<+1&&|a|m|e|]| |[|+|]|
19-
| +0&&@11
1+
| +0#af5f00255#ffffff0||+1#0000000&| +0&&@72
2+
|@+0#4040ff13&||+1#0000000&| +0&&@72
3+
|@+0#4040ff13&||+1#0000000&| +0&&@72
4+
|@+0#4040ff13&||+1#0000000&| +0&&@72
5+
|@+0#4040ff13&||+1#0000000&| +0&&@72
6+
|@+0#4040ff13&||+1#0000000&| +0&&@72
7+
|@+0#4040ff13&||+1#0000000&| +0&&@72
8+
|@+0#4040ff13&||+1#0000000&| +0&&@72
9+
|@+0#4040ff13&||+1#0000000&| +0&&@72
10+
|@+0#4040ff13&||+1#0000000&| +0&&@72
11+
|@+0#4040ff13&||+1#0000000&| +0&&@72
12+
|@+0#4040ff13&||+1#0000000&| +0&&@72
13+
|@+0#4040ff13&||+1#0000000&| +0&&@72
14+
|@+0#4040ff13&||+1#0000000&| +0&&@72
15+
|@+0#4040ff13&||+1#0000000&| +0&&@72
16+
|@+0#4040ff13&||+1#0000000&| +0&&@72
17+
>@+0#4040ff13&||+1#0000000&| +0&&@72
18+
|<+3&&| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @59
19+
| +0&&@74

src/testdir/test_scroll_opt.vim

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot()
840840
let lines =<< trim END
841841
silent normal yy
842842
silent normal 19p
843-
winsize 0 19
843+
set cpoptions+=n
844844
vsplit
845845
vertical resize 0
846846
set foldcolumn=1
@@ -849,9 +849,7 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot()
849849
silent normal 20G
850850
END
851851
call writefile(lines, 'XSmoothScrollZeroBot', 'D')
852-
let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19, wait_for_ruler: 0})
853-
call TermWait(buf, 1000)
854-
852+
let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
855853
call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot', {})
856854

857855
call StopVimInTerminal(buf)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1667,
698700
/**/
699701
1666,
700702
/**/

0 commit comments

Comments
 (0)