To: vim_dev@googlegroups.com Subject: Patch 8.2.2698 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2698 (after 8.2.2696) Problem: Lua test fails on MS-Windows. Solution: Fall back to old method if "lua -v" doesn't work. Files: src/testdir/test_lua.vim *** ../vim-8.2.2697/src/testdir/test_lua.vim 2021-04-03 14:13:29.644785091 +0200 --- src/testdir/test_lua.vim 2021-04-03 15:33:31.101356508 +0200 *************** *** 14,22 **** " Depending on the lua version, the error messages are different. let s:luaver = split(split(systemlist('lua -v')[0], ' ')[1], '\.') let s:major = str2nr(s:luaver[0]) let s:minor = str2nr(s:luaver[1]) ! let s:patch = str2nr(s:luaver[2]) let s:lua_53_or_later = 0 let s:lua_543_or_later = 0 if (s:major == 5 && s:minor >= 3) || s:major > 5 --- 14,30 ---- " 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]) ! 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 *** ../vim-8.2.2697/src/version.c 2021-04-03 15:15:43.871614324 +0200 --- src/version.c 2021-04-03 15:35:13.897117232 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2698, /**/ -- hundred-and-one symptoms of being an internet addict: 47. You are so familiar with the WWW that you find the search engines useless. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///