diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-17 12:04:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-17 12:04:54 +0200 |
| commit | f7d267ef20a38eb316915b91cb5a89021555f9d8 (patch) | |
| tree | f416f8f5757f6835463395ef1a2a11bec18384d3 | |
| parent | 101f4810e27e432970bc8809e18f018e1795937f (diff) | |
| download | vim-git-8.2.0993.tar.gz | |
patch 8.2.0993: Vim9 script test fails with normal featuresv8.2.0993
Problem: Vim9 script test fails with normal features.
Solution: Use :func instead of :def for now.
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index d56b90e2e..91ddc6bf4 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -778,7 +778,7 @@ def Test_vim9script_fails() assert_fails('export something', 'E1043') enddef -def Test_import_fails_without_script() +func Test_import_fails_without_script() CheckRunVimInTerminal let export =<< trim END @@ -787,15 +787,14 @@ def Test_import_fails_without_script() return 0 enddef END - writefile(export, 'Xexport.vim') + call writefile(export, 'Xexport.vim') - let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{ - rows: 6, wait_for_ruler: 0}) - WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))}) + let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{rows: 6, wait_for_ruler: 0}) + call WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))}) - delete('Xexport.vim') - StopVimInTerminal(buf) -enddef + call delete('Xexport.vim') + call StopVimInTerminal(buf) +endfunc def Test_vim9script_reload_import() let lines =<< trim END diff --git a/src/version.c b/src/version.c index c1d8ca027..c97a08998 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 */ /**/ + 993, +/**/ 992, /**/ 991, |