# HG changeset patch # User Christian Brabandt # Date 1449158405 -3600 # Node ID 979f8a595326dd076d85a77de0fbcf2ae1cf58af # Parent ac824bb0b755ebe7a81fa253cd392159b9ab08d2 commit https://github.com/vim/vim/commit/6cd1345307440491580e5e86cb82c54ee9a46baa Author: Bram Moolenaar Date: Thu Dec 3 16:54:53 2015 +0100 patch 7.4.952 Problem: 'lispwords' is tested in the old way. Solution: Make a new style test for 'lispwords'. diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak --- a/src/testdir/Make_amiga.mak +++ b/src/testdir/Make_amiga.mak @@ -34,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test81.out test82.out test83.out test84.out test88.out \ test89.out test90.out test91.out test92.out test93.out \ test94.out test95.out test96.out test97.out test98.out \ - test99.out test100.out test101.out test102.out test103.out \ + test99.out test101.out test102.out test103.out \ test104.out test105.out test106.out test107.out \ test_argument_0count.out \ test_argument_count.out \ @@ -185,7 +185,6 @@ test96.out: test96.in test97.out: test97.in test98.out: test98.in test99.out: test99.in -test100.out: test100.in test101.out: test101.in test102.out: test102.in test103.out: test103.in diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -33,7 +33,7 @@ SCRIPTS = test3.out test4.out test5.out test84.out test85.out test86.out test87.out test88.out \ test89.out test90.out test91.out test92.out test93.out \ test94.out test95.out test96.out test98.out test99.out \ - test100.out test101.out test102.out test103.out test104.out \ + test101.out test102.out test103.out test104.out \ test105.out test106.out test107.out\ test_argument_0count.out \ test_argument_count.out \ diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -55,7 +55,7 @@ SCRIPTS = test3.out test4.out test5.out test84.out test85.out test86.out test87.out test88.out \ test89.out test90.out test91.out test92.out test93.out \ test94.out test95.out test96.out test98.out test99.out \ - test100.out test101.out test102.out test103.out test104.out \ + test101.out test102.out test103.out test104.out \ test105.out test106.out test107.out \ test_argument_0count.out \ test_argument_count.out \ diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak --- a/src/testdir/Make_os2.mak +++ b/src/testdir/Make_os2.mak @@ -35,7 +35,7 @@ SCRIPTS = test1.out test3.out test4.out test81.out test82.out test83.out test84.out test88.out \ test89.out test90.out test91.out test92.out test93.out \ test94.out test95.out test96.out test98.out test99.out \ - test100.out test101.out test102.out test103.out test104.out \ + test101.out test102.out test103.out test104.out \ test105.out test106.out test107.out \ test_argument_0count.out \ test_argument_count.out \ diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms --- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, # Sandor Kopanyi, # -# Last change: 2015 Sep 08 +# Last change: 2015 Dec 03 # # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. # Edit the lines in the Configuration section below to select. @@ -94,7 +94,7 @@ SCRIPT = test1.out test2.out test3.out test82.out test84.out test88.out test89.out \ test90.out test91.out test92.out test93.out test94.out \ test95.out test96.out test98.out test99.out \ - test100.out test101.out test103.out test104.out \ + test101.out test103.out test104.out \ test105.out test106.out test107.out \ test_argument_0count.out \ test_argument_count.out \ diff --git a/src/testdir/Makefile b/src/testdir/Makefile --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -31,7 +31,7 @@ SCRIPTS = test1.out test2.out test3.out test84.out test85.out test86.out test87.out test88.out \ test89.out test90.out test91.out test92.out test93.out \ test94.out test95.out test96.out test97.out test98.out \ - test99.out test100.out test101.out test102.out test103.out \ + test99.out test101.out test102.out test103.out \ test104.out test105.out test106.out test107.out \ test_argument_0count.out \ test_argument_count.out \ diff --git a/src/testdir/test100.in b/src/testdir/test100.in deleted file mode 100644 --- a/src/testdir/test100.in +++ /dev/null @@ -1,16 +0,0 @@ -Tests for 'lispwords' settings being global-local - -STARTTEST -:so small.vim -:set nocompatible viminfo+=nviminfo -:" -:" Testing 'lispwords' -:" -:setglobal lispwords=foo,bar,baz -:setlocal lispwords-=foo | setlocal lispwords+=quux -:redir >> test.out | echon "\nTesting 'lispwords' local value" | setglobal lispwords? | setlocal lispwords? | echo &lispwords . "\n" | redir end -:setlocal lispwords< -:redir >> test.out | echon "\nTesting 'lispwords' value reset" | setglobal lispwords? | setlocal lispwords? | echo &lispwords . "\n" | redir end -:qa! -ENDTEST - diff --git a/src/testdir/test100.ok b/src/testdir/test100.ok deleted file mode 100644 --- a/src/testdir/test100.ok +++ /dev/null @@ -1,10 +0,0 @@ - -Testing 'lispwords' local value - lispwords=foo,bar,baz - lispwords=bar,baz,quux -bar,baz,quux - -Testing 'lispwords' value reset - lispwords=foo,bar,baz - lispwords=foo,bar,baz -foo,bar,baz diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -1,5 +1,6 @@ " A series of tests that can run in one Vim invocation. " This makes testing go faster, since Vim doesn't need to restart. +source test_lispwords.vim +source test_sort.vim source test_undolevels.vim -source test_sort.vim diff --git a/src/testdir/test_lispwords.vim b/src/testdir/test_lispwords.vim new file mode 100644 --- /dev/null +++ b/src/testdir/test_lispwords.vim @@ -0,0 +1,16 @@ +" Tests for 'lispwords' settings being global-local + +set nocompatible viminfo+=nviminfo + +func Test_global_local_lispwords() + setglobal lispwords=foo,bar,baz + setlocal lispwords-=foo | setlocal lispwords+=quux + call assert_equal('foo,bar,baz', &g:lispwords) + call assert_equal('bar,baz,quux', &l:lispwords) + call assert_equal('bar,baz,quux', &lispwords) + + setlocal lispwords< + call assert_equal('foo,bar,baz', &g:lispwords) + call assert_equal('foo,bar,baz', &l:lispwords) + call assert_equal('foo,bar,baz', &lispwords) +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 952, +/**/ 951, /**/ 950,