patch 8.1.1357: test 37 is old style

Problem:    Test 37 is old style.
Solution:   Turn it into a new style test. (Yegappan Lakshmanan, closes #4398)

diff --git a/src/Makefile b/src/Makefile
index b6dfe75483f5302340bf6179d0737d919d01add9..ff5ae101601c5095cdd926e5997690bccd8b3040 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2179,7 +2179,7 @@ test_libvterm:
 test1 \
        test_eval \
        test3 \
-       test30 test37 test39 \
+       test30 test39 \
        test42 test44 test48 test49 \
        test52 test59 \
        test64 test69 \

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index f9f2b6504314485c2eb00d8690d9cdfa247092d5..6442236dce333e2faf8b10a9f78f2199847ff123 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -14,7 +14,6 @@ SCRIPTS_FIRST = \
 # Tests that run on all systems.
 SCRIPTS_ALL = \
        test3.out \
-       test37.out \
        test39.out \
        test42.out \
        test44.out \

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 8217cc33034fa857e81c530e86a6eab9be16d897..9a6d2d7e72bb435256fdb49ce9a4e807e66d8344 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -74,7 +74,7 @@ VIMPROG = <->vim.exe
 .SUFFIXES : .out .in
 
 SCRIPT = test1.out test3.out \
-       test30.out test37.out test39.out \
+       test30.out test39.out \
        test42.out test44.out test48.out test49.out \
        test64.out test69.out \
        test72.out test77a.out test88.out \

diff --git a/src/testdir/test37.in b/src/testdir/test37.in
deleted file mode 100644 (file)
index 8ca1125..0000000
--- a/src/testdir/test37.in
+++ /dev/null
@@ -1,116 +0,0 @@
-Test for 'scrollbind'. <eralston@computer.org>   Do not add a line below!
-STARTTEST
-:so small.vim
-:set noscrollbind
-:set scrollopt=ver,jump
-:set scrolloff=2
-:set nowrap
-:set noequalalways
-:set splitbelow
-:" TEST using two windows open to one buffer, one extra empty window
-:split
-:new
-\17t:
-:resize 8
-/^start of window 1$/
-zt:
-:set scrollbind
-\17j:
-:resize 7
-/^start of window 2$/
-zt:
-:set scrollbind
-:" -- start of tests --
-:" TEST scrolling down
-L5jHyy\17bpr0\17tHyy\17bpr1\17tL6jHyy\17bpr2\17kHyy\17bpr3:
-:" TEST scrolling up
-\17tH4k\17jH\17tHyy\17bpr4\17kHyy\17bpr5\17k3k\17tH\17jHyy\17bpr6\17tHyy\17bpr7:
-:" TEST horizontal scrolling
-:set scrollopt+=hor
-gg"zyyG"zpG\17t015zly$\17bp"zpG\17ky$\17bp"zpG:
-\17k10jH7zhg0y$\17bp"zpG\17tHg0y$\17bp"zpG:
-:set scrollopt-=hor
-:" ****** tests using two different buffers *****
-\17t\17j:
-:close
-\17t:
-:set noscrollbind
-:/^start of window 2$/,/^end of window 2$/y
-:new
-\17t\17j4"zpGp:
-\17t/^start of window 1$/
-zt:
-:set scrollbind
-\17j:
-/^start of window 2$/
-zt:
-:set scrollbind
-:" -- start of tests --
-:" TEST scrolling down
-L5jHyy\17bpr0\17tHyy\17bpr1\17tL6jHyy\17bpr2\17kHyy\17bpr3:
-:" TEST scrolling up
-\17tH4k\17jH\17tHyy\17bpr4\17kHyy\17bpr5\17k3k\17tH\17jHyy\17bpr6\17tHyy\17bpr7:
-:" TEST horizontal scrolling
-:set scrollopt+=hor
-gg"zyyG"zpG\17t015zly$\17bp"zpG\17ky$\17bp"zpG:
-\17k10jH7zhg0y$\17bp"zpG\17tHg0y$\17bp"zpG:
-:set scrollopt-=hor
-:" TEST syncbind
-\17t:set noscb
-ggL\17j:set noscb
-ggL:set scb
-\17t:set scb
-G\17jG:syncbind
-Hk\17tH\17jHyy\17bp\17tyy\17bp:
-\17t:set noscb
-ggL\17j:set noscb
-ggL:set scb
-\17t:set scb
-\17tG\17jG\17t:syncbind
-Hk\17jH\17tHyy\17bp\17t\17jyy\17bp:
-\17tH3k\17jH\17tHyy\17bp\17t\17jyy\17bp:
-:" ***** done with tests *****
-:w! test.out             " Write contents of this file
-:qa!
-ENDTEST
-
-
-start of window 1
-. line 01 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 01
-. line 02 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02
-. line 03 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 03
-. line 04 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 04
-. line 05 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 05
-. line 06 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 06
-. line 07 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 07
-. line 08 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 08
-. line 09 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 09
-. line 10 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 10
-. line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11
-. line 12 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 12
-. line 13 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 13
-. line 14 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 14
-. line 15 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 15
-end of window 1
-
-
-start of window 2
-. line 01 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 01
-. line 02 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 02
-. line 03 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 03
-. line 04 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 04
-. line 05 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 05
-. line 06 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 06
-. line 07 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 07
-. line 08 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 08
-. line 09 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 09
-. line 10 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 10
-. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
-. line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12
-. line 13 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 13
-. line 14 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 14
-. line 15 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 15
-. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
-end of window 2
-
-end of test37.in (please don't delete this line)

diff --git a/src/testdir/test37.ok b/src/testdir/test37.ok
deleted file mode 100644 (file)
index d0b7485..0000000
--- a/src/testdir/test37.ok
+++ /dev/null
@@ -1,33 +0,0 @@
-
-0 line 05 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 05
-1 line 05 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 05
-2 line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11
-3 line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
-4 line 06 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 06
-5 line 06 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 06
-6 line 02 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 02
-7 line 02 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02
-56789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02
-UTSRQPONMLKJIHGREDCBA9876543210 02
-. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
-. line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11
-
-0 line 05 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 05
-1 line 05 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 05
-2 line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11
-3 line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
-4 line 06 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 06
-5 line 06 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 06
-6 line 02 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 02
-7 line 02 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02
-56789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02
-UTSRQPONMLKJIHGREDCBA9876543210 02
-. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
-. line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11
-
-. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
-:set scrollbind
-:set scrollbind
-. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
-\17j:
-. line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12

diff --git a/src/testdir/test_scrollbind.vim b/src/testdir/test_scrollbind.vim
index baa24f197940173c8b8ef7aac8482b20e23dc70a..6c5488be05c912c95cbcdf945ffeea32c1583980 100644 (file)
--- a/src/testdir/test_scrollbind.vim
+++ b/src/testdir/test_scrollbind.vim
@@ -30,3 +30,243 @@ func Test_scrollbind()
   setl noscrollbind
   call assert_equal(0, topLineLeft - topLineRight)
 endfunc
+
+" Test for 'scrollbind'
+func Test_scrollbind_opt()
+  new | only
+  set noscrollbind
+  set scrollopt=ver,jump scrolloff=2 nowrap noequalalways splitbelow
+
+  " Insert the text used for the test
+  append
+
+
+start of window 1
+. line 01 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 01
+. line 02 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02
+. line 03 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 03
+. line 04 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 04
+. line 05 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 05
+. line 06 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 06
+. line 07 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 07
+. line 08 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 08
+. line 09 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 09
+. line 10 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 10
+. line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11
+. line 12 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 12
+. line 13 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 13
+. line 14 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 14
+. line 15 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 15
+end of window 1
+
+
+start of window 2
+. line 01 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 01
+. line 02 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 02
+. line 03 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 03
+. line 04 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 04
+. line 05 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 05
+. line 06 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 06
+. line 07 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 07
+. line 08 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 08
+. line 09 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 09
+. line 10 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 10
+. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
+. line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12
+. line 13 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 13
+. line 14 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 14
+. line 15 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 15
+. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
+end of window 2
+
+.
+
+  " Test using two windows open to one buffer, one extra empty window
+  split
+  new
+  wincmd t
+  resize 8
+  call search('^start of window 1$')
+  normal zt
+  set scrollbind
+  wincmd j
+  resize 7
+  call search('^start of window 2$')
+  normal zt
+  set scrollbind
+
+  " -- start of tests --
+  " Test scrolling down
+  normal L5jHyy
+  wincmd b | normal pr0
+  wincmd t | normal Hyy
+  wincmd b | normal pr1
+  wincmd t | normal L6jHyy
+  wincmd b | normal pr2
+  wincmd k | normal Hyy
+  wincmd b | normal pr3
+
+  " Test scrolling up
+  wincmd t | normal H4k
+  wincmd j | normal H
+  wincmd t | normal Hyy
+  wincmd b | normal pr4
+  wincmd k | normal Hyy
+  wincmd b | normal pr5
+  wincmd k | normal 3k
+  wincmd t | normal H
+  wincmd j | normal Hyy
+  wincmd b | normal pr6
+  wincmd t | normal Hyy
+  wincmd b | normal pr7
+
+  " Test horizontal scrolling
+  set scrollopt+=hor
+  normal gg"zyyG"zpG
+  wincmd t | normal 015zly$
+  wincmd b | normal p"zpG
+  wincmd k | normal y$
+  wincmd b | normal p"zpG
+  wincmd k | normal 10jH7zhg0y$
+  wincmd b | normal p"zpG
+  wincmd t | normal Hg0y$
+  wincmd b | normal p"zpG
+  set scrollopt-=hor
+
+  wincmd b
+  call assert_equal([
+             \ '',
+             \ '0 line 05 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 05',
+             \ '1 line 05 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 05',
+             \ '2 line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11',
+             \ '3 line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11',
+             \ '4 line 06 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 06',
+             \ '5 line 06 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 06',
+             \ '6 line 02 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 02',
+             \ '7 line 02 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02',
+             \ '56789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02',
+             \ 'UTSRQPONMLKJIHGREDCBA9876543210 02',
+             \ '. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11',
+             \ '. line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11',
+             \ ''],  getline(1, '$'))
+  enew!
+
+  " ****** tests using two different buffers *****
+  wincmd t | wincmd j | close
+  wincmd t | set noscrollbind
+  /start of window 2$/,/^end of window 2$/y
+  new
+  wincmd t | wincmd j | normal 4"zpGp
+  wincmd t
+  call search('^start of window 1$')
+  normal zt
+  set scrollbind
+  wincmd j
+  call search('^start of window 2$')
+  normal zt
+  set scrollbind
+
+  " -- start of tests --
+  " Test scrolling down
+  normal L5jHyy
+  wincmd b | normal pr0
+  wincmd t | normal Hyy
+  wincmd b | normal pr1
+  wincmd t | normal L6jHyy
+  wincmd b | normal pr2
+  wincmd k | normal Hyy
+  wincmd b | normal pr3
+
+  " Test scrolling up
+  wincmd t | normal H4k
+  wincmd j | normal H
+  wincmd t | normal Hyy
+  wincmd b | normal pr4
+  wincmd k | normal Hyy
+  wincmd b | normal pr5
+  wincmd k | normal 3k
+  wincmd t | normal H
+  wincmd j | normal Hyy
+  wincmd b | normal pr6
+  wincmd t | normal Hyy
+  wincmd b | normal pr7
+
+  " Test horizontal scrolling
+  set scrollopt+=hor
+  normal gg"zyyG"zpG
+  wincmd t | normal 015zly$
+  wincmd b | normal p"zpG
+  wincmd k | normal y$
+  wincmd b | normal p"zpG
+  wincmd k | normal 10jH7zhg0y$
+  wincmd b | normal p"zpG
+  wincmd t | normal Hg0y$
+  wincmd b | normal p"zpG
+  set scrollopt-=hor
+
+  wincmd b
+  call assert_equal([
+             \ '',
+             \ '0 line 05 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 05',
+             \ '1 line 05 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 05',
+             \ '2 line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11',
+             \ '3 line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11',
+             \ '4 line 06 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 06',
+             \ '5 line 06 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 06',
+             \ '6 line 02 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 02',
+             \ '7 line 02 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02',
+             \ '56789ABCDEFGHIJKLMNOPQRSTUVWXYZ 02',
+             \ 'UTSRQPONMLKJIHGREDCBA9876543210 02',
+             \ '. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11',
+             \ '. line 11 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 11',
+             \ ''],  getline(1, '$'))
+  enew!
+
+  " Test 'syncbind'
+  wincmd t | set noscrollbind | normal ggL
+  wincmd j | set noscrollbind | normal ggL
+  set scrollbind
+  wincmd t | set scrollbind | normal G
+  wincmd j | normal G
+  syncbind
+  normal Hk
+  wincmd t | normal H
+  wincmd j | normal Hyy
+  wincmd b | normal p
+  wincmd t | normal yy
+  wincmd b | normal p
+  wincmd t | set noscrollbind | normal ggL
+  wincmd j | set noscrollbind
+  normal ggL
+  set scrollbind
+  wincmd t | set scrollbind
+  wincmd t | normal G
+  wincmd j | normal G
+  wincmd t | syncbind | normal Hk
+  wincmd j | normal H
+  wincmd t | normal Hyy
+  wincmd b | normal p
+  wincmd t | wincmd j | normal yy
+  wincmd b | normal p
+  wincmd t | normal H3k
+  wincmd j | normal H
+  wincmd t | normal Hyy
+  wincmd b | normal p
+  wincmd t | wincmd j | normal yy
+  wincmd b | normal p
+
+  wincmd b
+  call assert_equal([
+             \ '',
+             \ '. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16',
+             \ 'start of window 2',
+             \ 'start of window 2',
+             \ '. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16',
+             \ '. line 15 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 15',
+             \ '. line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12',
+             \ ],  getline(1, '$'))
+  enew!
+
+  new | only!
+  set scrollbind& scrollopt& scrolloff& wrap& equalalways& splitbelow&
+endfunc

diff --git a/src/version.c b/src/version.c
index 2dd024f0f9cddbe778a48489c0cf08782b4969e0..edc72ecfc3fdcfea83f3985b423f0382620b16a6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1357,
 /**/
     1356,
 /**/