summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_vim9_func.vim24
-rw-r--r--src/version.c2
2 files changed, 26 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 957b632e1..5e3ca1c2c 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -621,6 +621,30 @@ def Test_local_function_shadows_global()
END
CheckScriptFailure(lines, 'E705:')
delfunc g:Func
+
+ # global function is found without g: prefix
+ lines =<< trim END
+ vim9script
+ def g:Func(): string
+ return 'global'
+ enddef
+ def AnotherFunc(): string
+ return Func()
+ enddef
+ assert_equal('global', AnotherFunc())
+ delfunc g:Func
+ END
+ CheckScriptSuccess(lines)
+
+ lines =<< trim END
+ vim9script
+ def g:Func(): string
+ return 'global'
+ enddef
+ assert_equal('global', Func())
+ delfunc g:Func
+ END
+ CheckScriptSuccess(lines)
enddef
func TakesOneArg(arg)
diff --git a/src/version.c b/src/version.c
index f22d0cb25..961ddea1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2718,
+/**/
2717,
/**/
2716,