From b9c6b6fb73711f64943340b2c3f0bdf8744451b6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 3 Apr 2021 15:35:50 +0200 Subject: patch 8.2.2698: Lua test fails on MS-Windows Problem: Lua test fails on MS-Windows. Solution: Fall back to old method if "lua -v" doesn't work. --- src/testdir/test_lua.vim | 10 +++++++++- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src') 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 @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2698, /**/ 2697, /**/ -- cgit v1.2.1