patch 7.4.952v7.4.952

Problem:    'lispwords' is tested in the old way.
Solution:   Make a new style test for 'lispwords'.

11 files changed, 27 insertions, 35 deletions

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index b4a5d8e09..d60f1a1bb 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -34,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.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
index 208f4fbd4..8dbe97e2f 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -33,7 +33,7 @@ SCRIPTS =	test3.out test4.out test5.out test6.out test7.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
index bfbb5c23e..a7c98ee8d 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -55,7 +55,7 @@ SCRIPTS =	test3.out test4.out test5.out test6.out test7.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
index a0fd3a0ff..926411b64 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -35,7 +35,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.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
index 1817da6b9..990ae5f57 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# 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  test4.out  test5.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
index c7db9495e..932150697 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -31,7 +31,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.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
index 9b140a4d2..000000000
--- 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
index 4048dee4c..000000000
--- 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
index 97635095b..21a524116 100644
--- 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_undolevels.vim
+source test_lispwords.vim
 source test_sort.vim
+source test_undolevels.vim
diff --git a/src/testdir/test_lispwords.vim b/src/testdir/test_lispwords.vim
new file mode 100644
index 000000000..6d370a8bf
--- /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
index 4b2a1cbeb..887a2cba4 100644
--- 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,