summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-20 21:54:28 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-20 21:54:28 +0200
commit93a4879c2008bbd26aac072e7cdc65b3ce7c32a3 (patch)
tree0f342b9d0522ccbe9006a13e5c076ad893a54727
parentabc7c7fc5a098374f5543a237e6c9dd918848b34 (diff)
downloadvim-git-93a4879c2008bbd26aac072e7cdc65b3ce7c32a3.tar.gz
patch 8.1.1190: has('vimscript-3') does not workv8.1.1190
Problem: has('vimscript-3') does not work. Solution: Add "vimscript-3" to the list of features.
-rw-r--r--src/evalfunc.c1
-rw-r--r--src/testdir/test_eval_stuff.vim3
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7368ba284..a4d6ebf64 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6624,6 +6624,7 @@ f_has(typval_T *argvars, typval_T *rettv)
#endif
"vimscript-1",
"vimscript-2",
+ "vimscript-3",
"virtualedit",
"visual",
"visualextra",
diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index cba66b70f..c77972339 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -126,6 +126,7 @@ endfunc
scriptversion 2
func Test_string_concat_scriptversion2()
+ call assert_true(has('vimscript-2'))
let a = 'a'
let b = 'b'
@@ -141,6 +142,7 @@ endfunc
scriptversion 1
func Test_string_concat_scriptversion1()
+ call assert_true(has('vimscript-1'))
let a = 'a'
let b = 'b'
@@ -156,6 +158,7 @@ endfunc
scriptversion 3
func Test_vvar_scriptversion3()
+ call assert_true(has('vimscript-3'))
call assert_fails('echo version', 'E121:')
call assert_false(exists('version'))
let version = 1
diff --git a/src/version.c b/src/version.c
index 4e88823a5..126589554 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1190,
+/**/
1189,
/**/
1188,