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.

diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index f6cdae18d6e378488eb72c1b2f5ba3f359289046..89329eea760c3208e4564a3ece15d6030c5cdb55 100644 (file)
--- 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 4749ca98148cad400492bbf37bd61381182109c0..4b5afb9401467ddce2fa9e2aab1c94f6396541a7 100644 (file)
--- 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,
 /**/