To: vim_dev@googlegroups.com Subject: Patch 8.1.1357 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.1357 Problem: Test 37 is old style. Solution: Turn it into a new style test. (Yegappan Lakshmanan, closes #4398) Files: src/Makefile, src/testdir/Make_all.mak, src/testdir/Make_vms.mms, src/testdir/test37.in, src/testdir/test37.ok, src/testdir/test_scrollbind.vim *** ../vim-8.1.1356/src/Makefile 2019-05-14 17:57:14.861402461 +0200 --- src/Makefile 2019-05-19 21:40:34.148006562 +0200 *************** *** 2179,2185 **** test1 \ test_eval \ test3 \ ! test30 test37 test39 \ test42 test44 test48 test49 \ test52 test59 \ test64 test69 \ --- 2180,2186 ---- test1 \ test_eval \ test3 \ ! test30 test39 \ test42 test44 test48 test49 \ test52 test59 \ test64 test69 \ *** ../vim-8.1.1356/src/testdir/Make_all.mak 2019-05-14 17:57:14.861402461 +0200 --- src/testdir/Make_all.mak 2019-05-19 21:40:34.148006562 +0200 *************** *** 14,20 **** # Tests that run on all systems. SCRIPTS_ALL = \ test3.out \ - test37.out \ test39.out \ test42.out \ test44.out \ --- 14,19 ---- *** ../vim-8.1.1356/src/testdir/Make_vms.mms 2019-05-14 17:57:14.861402461 +0200 --- src/testdir/Make_vms.mms 2019-05-19 21:40:34.148006562 +0200 *************** *** 74,80 **** .SUFFIXES : .out .in SCRIPT = test1.out test3.out \ ! test30.out test37.out test39.out \ test42.out test44.out test48.out test49.out \ test64.out test69.out \ test72.out test77a.out test88.out \ --- 74,80 ---- .SUFFIXES : .out .in SCRIPT = test1.out test3.out \ ! test30.out test39.out \ test42.out test44.out test48.out test49.out \ test64.out test69.out \ test72.out test77a.out test88.out \ *** ../vim-8.1.1356/src/testdir/test37.in 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test37.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,116 **** - Test for 'scrollbind'. 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 - t: - :resize 8 - /^start of window 1$/ - zt: - :set scrollbind - j: - :resize 7 - /^start of window 2$/ - zt: - :set scrollbind - :" -- start of tests -- - :" TEST scrolling down - L5jHyybpr0tHyybpr1tL6jHyybpr2kHyybpr3: - :" TEST scrolling up - tH4kjHtHyybpr4kHyybpr5k3ktHjHyybpr6tHyybpr7: - :" TEST horizontal scrolling - :set scrollopt+=hor - gg"zyyG"zpGt015zly$bp"zpGky$bp"zpG: - k10jH7zhg0y$bp"zpGtHg0y$bp"zpG: - :set scrollopt-=hor - :" ****** tests using two different buffers ***** - tj: - :close - t: - :set noscrollbind - :/^start of window 2$/,/^end of window 2$/y - :new - tj4"zpGp: - t/^start of window 1$/ - zt: - :set scrollbind - j: - /^start of window 2$/ - zt: - :set scrollbind - :" -- start of tests -- - :" TEST scrolling down - L5jHyybpr0tHyybpr1tL6jHyybpr2kHyybpr3: - :" TEST scrolling up - tH4kjHtHyybpr4kHyybpr5k3ktHjHyybpr6tHyybpr7: - :" TEST horizontal scrolling - :set scrollopt+=hor - gg"zyyG"zpGt015zly$bp"zpGky$bp"zpG: - k10jH7zhg0y$bp"zpGtHg0y$bp"zpG: - :set scrollopt-=hor - :" TEST syncbind - t:set noscb - ggLj:set noscb - ggL:set scb - t:set scb - GjG:syncbind - HktHjHyybptyybp: - t:set noscb - ggLj:set noscb - ggL:set scb - t:set scb - tGjGt:syncbind - HkjHtHyybptjyybp: - tH3kjHtHyybptjyybp: - :" ***** 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) --- 0 ---- *** ../vim-8.1.1356/src/testdir/test37.ok 2013-12-14 12:54:57.000000000 +0100 --- src/testdir/test37.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,33 **** - - 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 - j: - . line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12 --- 0 ---- *** ../vim-8.1.1356/src/testdir/test_scrollbind.vim 2017-08-04 22:13:08.000000000 +0200 --- src/testdir/test_scrollbind.vim 2019-05-19 21:40:34.148006562 +0200 *************** *** 30,32 **** --- 30,272 ---- 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 *** ../vim-8.1.1356/src/version.c 2019-05-19 21:37:14.189063500 +0200 --- src/version.c 2019-05-19 21:41:49.311608616 +0200 *************** *** 769,770 **** --- 769,772 ---- { /* Add new patch number below this line */ + /**/ + 1357, /**/ -- Normal people believe that if it ain't broke, don't fix it. Engineers believe that if it ain't broke, it doesn't have enough features yet. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///