summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-17 20:03:36 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-17 20:03:36 +0200
commit9bb3eb3e02a942fb71a4c1ce913f938d0ddf82d5 (patch)
tree76e8f52bd09a267ea6d562f1257a8ef7a6bf428a
parentf7d267ef20a38eb316915b91cb5a89021555f9d8 (diff)
patch 8.2.0994: Vim9: missing function causes compilation errorv8.2.0994
Problem: Vim9: missing function causes compilation error. Solution: Call test function indirectly.
-rw-r--r--src/testdir/test_vim9_script.vim18
-rw-r--r--src/version.c2
2 files changed, 14 insertions, 6 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 91ddc6bf47..2fa88e8365 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -781,20 +781,26 @@ enddef
func Test_import_fails_without_script()
CheckRunVimInTerminal
+ " call indirectly to avoid compilation error for missing functions
+ call Run_Test_import_fails_without_script()
+endfunc
+
+def Run_Test_import_fails_without_script()
let export =<< trim END
vim9script
export def Foo(): number
return 0
enddef
END
- call writefile(export, 'Xexport.vim')
+ writefile(export, 'Xexport.vim')
- let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{rows: 6, wait_for_ruler: 0})
- call WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))})
+ let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{
+ rows: 6, wait_for_ruler: 0})
+ WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))})
- call delete('Xexport.vim')
- call StopVimInTerminal(buf)
-endfunc
+ delete('Xexport.vim')
+ StopVimInTerminal(buf)
+enddef
def Test_vim9script_reload_import()
let lines =<< trim END
diff --git a/src/version.c b/src/version.c
index c97a089987..a5c6de5f31 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 994,
+/**/
993,
/**/
992,