thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2698: Lua test fails on MS-Windows

Browse Source 
Problem:    Lua test fails on MS-Windows.
Solution:   Fall back to old method if "lua -v" doesn't work.
This commit is contained in:
Bram Moolenaar
2021-04-03 15:35:50 +02:00
parent 0df6030145
commit b9c6b6fb73
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_lua.vim
View File

@@ -14,9 +14,17 @@ CheckFeature float
" Depending on the lua version, the error messages are different. " Depending on the lua version, the error messages are different.
let s:luaver = split(split(systemlist('lua -v')[0], ' ')[1], '\.') 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:major = str2nr(s:luaver[0])
let s:minor = str2nr(s:luaver[1]) let s:minor = str2nr(s:luaver[1])
if len(s:luaver >= 3)
let s:patch = str2nr(s:luaver[2]) let s:patch = str2nr(s:luaver[2])
else
let s:patch = 0
endif
let s:lua_53_or_later = 0 let s:lua_53_or_later = 0
let s:lua_543_or_later = 0 let s:lua_543_or_later = 0
if (s:major == 5 && s:minor >= 3) || s:major > 5 if (s:major == 5 && s:minor >= 3) || s:major > 5

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2698,
/**/ /**/
2697, 2697,
/**/ /**/