Skip to content

Commit 6cd1345

Browse files
committed
patch 7.4.952
Problem: 'lispwords' is tested in the old way. Solution: Make a new style test for 'lispwords'.
1 parent b00da1d commit 6cd1345

11 files changed

Lines changed: 27 additions & 35 deletions

File tree

src/testdir/Make_amiga.mak

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
3434
test81.out test82.out test83.out test84.out test88.out \
3535
test89.out test90.out test91.out test92.out test93.out \
3636
test94.out test95.out test96.out test97.out test98.out \
37-
test99.out test100.out test101.out test102.out test103.out \
37+
test99.out test101.out test102.out test103.out \
3838
test104.out test105.out test106.out test107.out \
3939
test_argument_0count.out \
4040
test_argument_count.out \
@@ -185,7 +185,6 @@ test96.out: test96.in
185185
test97.out: test97.in
186186
test98.out: test98.in
187187
test99.out: test99.in
188-
test100.out: test100.in
189188
test101.out: test101.in
190189
test102.out: test102.in
191190
test103.out: test103.in

src/testdir/Make_dos.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
3333
test84.out test85.out test86.out test87.out test88.out \
3434
test89.out test90.out test91.out test92.out test93.out \
3535
test94.out test95.out test96.out test98.out test99.out \
36-
test100.out test101.out test102.out test103.out test104.out \
36+
test101.out test102.out test103.out test104.out \
3737
test105.out test106.out test107.out\
3838
test_argument_0count.out \
3939
test_argument_count.out \

src/testdir/Make_ming.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
5555
test84.out test85.out test86.out test87.out test88.out \
5656
test89.out test90.out test91.out test92.out test93.out \
5757
test94.out test95.out test96.out test98.out test99.out \
58-
test100.out test101.out test102.out test103.out test104.out \
58+
test101.out test102.out test103.out test104.out \
5959
test105.out test106.out test107.out \
6060
test_argument_0count.out \
6161
test_argument_count.out \

src/testdir/Make_os2.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
3535
test81.out test82.out test83.out test84.out test88.out \
3636
test89.out test90.out test91.out test92.out test93.out \
3737
test94.out test95.out test96.out test98.out test99.out \
38-
test100.out test101.out test102.out test103.out test104.out \
38+
test101.out test102.out test103.out test104.out \
3939
test105.out test106.out test107.out \
4040
test_argument_0count.out \
4141
test_argument_count.out \

src/testdir/Make_vms.mms

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Authors: Zoltan Arpadffy, <[email protected]>
55
# Sandor Kopanyi, <[email protected]>
66
#
7-
# Last change: 2015 Sep 08
7+
# Last change: 2015 Dec 03
88
#
99
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
1010
# 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 \
9494
test82.out test84.out test88.out test89.out \
9595
test90.out test91.out test92.out test93.out test94.out \
9696
test95.out test96.out test98.out test99.out \
97-
test100.out test101.out test103.out test104.out \
97+
test101.out test103.out test104.out \
9898
test105.out test106.out test107.out \
9999
test_argument_0count.out \
100100
test_argument_count.out \

src/testdir/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
3131
test84.out test85.out test86.out test87.out test88.out \
3232
test89.out test90.out test91.out test92.out test93.out \
3333
test94.out test95.out test96.out test97.out test98.out \
34-
test99.out test100.out test101.out test102.out test103.out \
34+
test99.out test101.out test102.out test103.out \
3535
test104.out test105.out test106.out test107.out \
3636
test_argument_0count.out \
3737
test_argument_count.out \

src/testdir/test100.in

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/testdir/test100.ok

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/testdir/test_alot.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
" A series of tests that can run in one Vim invocation.
22
" This makes testing go faster, since Vim doesn't need to restart.
33

4-
source test_undolevels.vim
4+
source test_lispwords.vim
55
source test_sort.vim
6+
source test_undolevels.vim

src/testdir/test_lispwords.vim

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
" Tests for 'lispwords' settings being global-local
2+
3+
set nocompatible viminfo+=nviminfo
4+
5+
func Test_global_local_lispwords()
6+
setglobal lispwords=foo,bar,baz
7+
setlocal lispwords-=foo | setlocal lispwords+=quux
8+
call assert_equal('foo,bar,baz', &g:lispwords)
9+
call assert_equal('bar,baz,quux', &l:lispwords)
10+
call assert_equal('bar,baz,quux', &lispwords)
11+
12+
setlocal lispwords<
13+
call assert_equal('foo,bar,baz', &g:lispwords)
14+
call assert_equal('foo,bar,baz', &l:lispwords)
15+
call assert_equal('foo,bar,baz', &lispwords)
16+
endfunc

0 commit comments

Comments
 (0)