diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-04-03 15:35:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-04-03 15:35:50 +0200 |
| commit | b9c6b6fb73711f64943340b2c3f0bdf8744451b6 (patch) | |
| tree | 3e8b4d64fc0d775fb3a6c6a412f429d6596ce32c | |
| parent | 0df603014589c663f4b49dc6fd36c3b99db1718f (diff) | |
| download | vim-git-8.2.2698.tar.gz | |
patch 8.2.2698: Lua test fails on MS-Windowsv8.2.2698
Problem: Lua test fails on MS-Windows.
Solution: Fall back to old method if "lua -v" doesn't work.
| -rw-r--r-- | src/testdir/test_lua.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim index f6cdae18d..89329eea7 100644 --- a/src/testdir/test_lua.vim +++ b/src/testdir/test_lua.vim @@ -14,9 +14,17 @@ CheckFeature float " Depending on the lua version, the error messages are different. let s:luaver = split(split(systemlist('lua -v')[0], ' ')[1], '\.') +if len(s:luaver) < 3 + " Didn't get something that looks like a version, use _VERSION. + let s:luaver = split(split(luaeval('_VERSION'), ' ')[1], '\.') +endif let s:major = str2nr(s:luaver[0]) let s:minor = str2nr(s:luaver[1]) -let s:patch = str2nr(s:luaver[2]) +if len(s:luaver >= 3) + let s:patch = str2nr(s:luaver[2]) +else + let s:patch = 0 +endif let s:lua_53_or_later = 0 let s:lua_543_or_later = 0 if (s:major == 5 && s:minor >= 3) || s:major > 5 diff --git a/src/version.c b/src/version.c index 4749ca981..4b5afb940 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 */ /**/ + 2698, +/**/ 2697, /**/ 2696, |