aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroni-link <knil.ino@gmail.com>2014-04-09 19:19:56 +0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-12 16:48:09 -0300
commit77c2c6947974d54c28c93e6e8509bc2d07c882fe (patch)
tree270d0163a676f00b0d17aaf0968acadaf18621bd
parent1e7dfc8c90187d34f20b3d99df40c04c0a6a9c69 (diff)
downloadrneovim-77c2c6947974d54c28c93e6e8509bc2d07c882fe.tar.gz
rneovim-77c2c6947974d54c28c93e6e8509bc2d07c882fe.tar.bz2
rneovim-77c2c6947974d54c28c93e6e8509bc2d07c882fe.zip
vim-patch:7.4.167
Problem: Fixes are not tested. Solution: Add a test for not autoloading on assignment. (Yukihiro Nakadaira) https://code.google.com/p/vim/source/detail?r=22387c8eec43ea8b1b704cad49c8f7187e2fd579
-rw-r--r--src/testdir/Makefile3
-rw-r--r--src/testdir/sautest/autoload/Test104.vim1
-rw-r--r--src/testdir/test104.in16
-rw-r--r--src/testdir/test104.ok2
-rw-r--r--src/version.c2
5 files changed, 22 insertions, 2 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 85188b84b7..5402935b1f 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -25,7 +25,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
index 0000000000..d1e0e17a3b
--- /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
index 0000000000..f329d2dbed
--- /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
index 0000000000..5c16509af9
--- /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 3db05cf6ff..3016b224cf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -234,7 +234,7 @@ static int included_patches[] = {
170,
169,
//168,
- //167,
+ 167,
166,
//165,
//164,