updated for version 7.4.167

Problem:    Fixes are not tested.
Solution:   Add a test for not autoloading on assignment. (Yukihiro Nakadaira)

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 0fd1e86891b5329008f0c737b0e3012217778ec2..e76ecb07d10b074d7cfbd787a544f802cce7fe10 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -34,7 +34,8 @@ 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 test100.out test101.out test102.out test103.out \
+               test104.out
 
 .SUFFIXES: .in .out
 
@@ -154,3 +155,4 @@ test100.out: test100.in
 test101.out: test101.in
 test102.out: test102.in
 test103.out: test103.in
+test104.out: test104.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 05e14224709f97923d71db887f3163e8ccb8c637..58553598530d7e8376120e15559577666270be90 100644 (file)
--- 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
+               test100.out test101.out test102.out test103.out test104.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 384fe73f820642a1249f2455f2b41635c99f29db..4b9327977778579928f420d998adc1af2ccdb51d 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -53,7 +53,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
+               test100.out test101.out test102.out test103.out test104.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 7af826d361056195fc7893031da36d26e50b37b9..7e37df70b14e693783090faf0e791f0bf6db6cf6 100644 (file)
--- 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
+               test100.out test101.out test102.out test103.out test104.out
 
 .SUFFIXES: .in .out
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 370406145ee6b25672e70a47e175bb3d91685058..f3483da437b54b1245f8903929ea2019b028fff6 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -79,7 +79,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.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
+        test100.out test101.out test102.out test103.out test104.out
 
 # Known problems:
 # Test 30: a problem around mac format - unknown reason

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index bae4f44ff14335698c400bcae900ea757d71e13a..bd298369c5a1ededd311d0a91c8ba62bb5e9e81e 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -30,7 +30,8 @@ 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 test100.out test101.out test102.out test103.out \
+               test104.out
 
 SCRIPTS_GUI = test16.out
 

diff --git a/src/testdir/sautest/autoload/Test104.vim b/src/testdir/sautest/autoload/Test104.vim
new file mode 100644 (file)
index 0000000..d1e0e17
--- /dev/null
+++ b/src/testdir/sautest/autoload/Test104.vim
@@ -0,0 +1 @@
+let Test104#numvar = 123

diff --git a/src/testdir/test104.in b/src/testdir/test104.in
new file mode 100644 (file)
index 0000000..f329d2d
--- /dev/null
+++ b/src/testdir/test104.in
@@ -0,0 +1,16 @@
+Tests for autoload.  vim: set ft=vim ts=8 :
+
+STARTTEST
+:so small.vim
+:set runtimepath+=./sautest
+:" Test to not autoload when assigning.  It causes internal error.
+:try
+:  let Test104#numvar = function('tr')
+:  $put ='OK: ' . string(Test104#numvar)
+:catch
+:  $put ='FAIL: ' . v:exception
+:endtry
+:/^Results/,$wq! test.out
+ENDTEST
+
+Results of test104:

diff --git a/src/testdir/test104.ok b/src/testdir/test104.ok
new file mode 100644 (file)
index 0000000..5c16509
--- /dev/null
+++ b/src/testdir/test104.ok
@@ -0,0 +1,2 @@
+Results of test104:
+OK: function('tr')

diff --git a/src/version.c b/src/version.c
index 3e6282a493c94f5d1020ac8f3f5db669d3746e92..81639c9be21180c58433c3035b28c8eccd145a9a 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 */
+/**/
+    167,
 /**/
     166,
 /**/