updated for version 7.4.075

Problem:    Locally setting 'undolevels' is not tested.
Solution:   Add a test. (Christian Brabandt)

diff --git a/src/Makefile b/src/Makefile
index c83037869bf7366ed25de94825e61ac0836323de..bceb65c8e5546a1bbe5fb097667b43d59b7d33a4 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1882,7 +1882,8 @@ test1 test2 test3 test4 test5 test6 test7 test8 test9 \
        test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
        test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
        test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
-       test90 test91 test92 test93 test94 test95 test96 test97 test98 test99:
+       test90 test91 test92 test93 test94 test95 test96 test97 test98 test99 \
+       test100 test101 test102 test103 test104 test105 test106 test107:
        cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET)
 
 testclean:

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index ce7dc3085f4e0ca9c278fead7278ca097e24a8f1..81633e7ca3f0809b07a6959461934c318686b19c 100644 (file)
--- 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
+               test99.out test100.out
 
 .SUFFIXES: .in .out
 
@@ -150,3 +150,4 @@ test96.out: test96.in
 test97.out: test97.in
 test98.out: test98.in
 test99.out: test99.in
+test100.out: test100.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index d1551983ef1fa4384bfb4b932db2fc79b4673d0e..f89d99be73c5b0ccf5c25e999dd2e868e01a47ba 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -32,7 +32,8 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test79.out test80.out test81.out test82.out test83.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
+               test94.out test95.out test96.out test98.out test99.out \
+               test100.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 380594c1195a726580062c5da405b41cd225cc41..eb0c469df2bbc6c53b9de9ea8da138febf46123e 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -52,7 +52,8 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test79.out test80.out test81.out test82.out test83.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
+               test94.out test95.out test96.out test98.out test99.out \
+               test100out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index e7ec6178012336069a8a376a5fb365bc6fa65fde..acb7bd76b5a5b7753856303a5554dd34dabc659c 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -34,7 +34,8 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test76.out test77.out test78.out test79.out test80.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
+               test94.out test95.out test96.out test98.out test99.out \
+               test100.out
 
 .SUFFIXES: .in .out
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 2001bfc2b7016910542671e24668b9dbc0df1e65..816123d6f66948c2601f07bd2c47f215d29c3bf0 100644 (file)
--- 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:  2013 Sep 19
+# Last change:  2013 Nov 07
 #
 # 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.
@@ -78,7 +78,8 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         test77.out test78.out test79.out test80.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
+        test95.out test96.out test97.out test98.out test99.out \
+        test100.out
 
 # Known problems:
 # Test 30: a problem around mac format - unknown reason

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index f736d54d9e75ce3ae05d54461d05998f1a6d8e2a..3620cee178e5ca20f28e759b5f96bd5f40be353b 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -30,7 +30,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
+               test99.out test100.out
 
 SCRIPTS_GUI = test16.out
 

diff --git a/src/testdir/test100.in b/src/testdir/test100.in
new file mode 100644 (file)
index 0000000..e423319
--- /dev/null
+++ b/src/testdir/test100.in
@@ -0,0 +1,42 @@
+Tests for 'undolevel' setting being global-local
+
+STARTTEST
+:so small.vim
+:set nocompatible viminfo+=nviminfo ul=5
+:fu! FillBuffer()
+  :for i in range(1,13)
+    :put=i
+    :exe "setg ul=" . &g:ul
+  :endfor
+:endfu
+:fu! UndoLevel()
+  :redir @a | setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |redir end
+  :$put a
+:endfu
+:new one
+:0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
+:call FillBuffer()
+:call feedkeys(":earlier 10\n", 't')
+:call UndoLevel()
+:%w! test.out
+:new two
+:0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
+:setlocal ul=2
+:call FillBuffer()
+:call feedkeys(":earlier 10\n", 't')
+:call UndoLevel()
+:setlocal ul=10
+:call UndoLevel()
+:%w >> test.out
+:wincmd p
+:redir >>test.out | echo "global value shouldn't be changed and still be 5!" | echo 'ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'|:setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |echo "" |redir end
+:new three
+:setglobal ul=50
+:1put ='global value should be changed to 50'
+:2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)'
+:call UndoLevel()
+:%w >> test.out
+:"sleep 10
+:qa!
+ENDTEST
+

diff --git a/src/testdir/test100.ok b/src/testdir/test100.ok
new file mode 100644 (file)
index 0000000..95b3184
--- /dev/null
+++ b/src/testdir/test100.ok
@@ -0,0 +1,41 @@
+ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
+1
+2
+3
+4
+5
+6
+7
+
+
+  undolevels=5 global
+  undolevels=-123456 local
+TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+
+
+  undolevels=5 global
+  undolevels=2 local
+
+  undolevels=5 global
+  undolevels=10 local
+
+global value shouldn't be changed and still be 5!
+ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
+  undolevels=5 global
+  undolevels=-123456 local
+
+global value should be changed to 50
+THREE: expecting global undolevels: 50, local undolevels: -123456 (default)
+
+  undolevels=50 global
+  undolevels=-123456 local

diff --git a/src/version.c b/src/version.c
index 60f9bf1b971ab8ab7fcb9ab97680ecad04ff09f4..4b7b68ce0ae6d19e76b65e61705496ed36345583 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    75,
 /**/
     74,
 /**/