summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>2022-01-28 17:20:03 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-28 17:20:03 +0000
commit57ff2b7068c03c89fbfc8930e1325274e72d22a3 (patch)
tree01e50f31188c08c9d77153152d6eb80742b1a2bb
parentfb55207ed17918c8a2a6cadf5ad9d5fcf686a7ab (diff)
patch 8.2.4243: Lua tests fail with Lua 5.4.4v8.2.4243
Problem: Lua tests fail with Lua 5.4.4. Solution: Check messages like before Lua 5.4.3. (Jakub KulĂ­k, closes #9652)
-rw-r--r--src/testdir/test_lua.vim18
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 10 deletions
diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index dd493fe79a..fd265ef431 100644
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -15,13 +15,11 @@ CheckFeature float
" Depending on the lua version, the error messages are different.
let [s:major, s:minor, s:patch] = luaeval('vim.lua_version')->split('\.')->map({-> str2nr(v:val)})
let s:lua_53_or_later = 0
-let s:lua_543_or_later = 0
+let s:lua_543 = 0
if (s:major == 5 && s:minor >= 3) || s:major > 5
let s:lua_53_or_later = 1
- if (s:major == 5
- \ && ((s:minor == 4 && s:patch >= 3) || s:minor > 4))
- \ || s:major > 5
- let s:lua_543_or_later = 1
+ if s:major == 5 && s:minor == 4 && s:patch == 3
+ let s:lua_543 = 1
endif
endif
@@ -59,7 +57,7 @@ func Test_lua_luado()
" Error cases
call assert_fails('luado string.format()',
\ "[string \"vim chunk\"]:1: bad argument #1 to 'format' (string expected, got no value)")
- if s:lua_543_or_later
+ if s:lua_543
let msg = "[string \"vim chunk\"]:1: global 'func' is not callable (a nil value)"
elseif s:lua_53_or_later
let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (global 'func')"
@@ -151,7 +149,7 @@ func Test_lua_window()
" Window 3 does not exist so vim.window(3) should return nil
call assert_equal('nil', luaeval('tostring(vim.window(3))'))
- if s:lua_543_or_later
+ if s:lua_543
let msg = "[string \"luaeval\"]:1: field 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later
let msg = "[string \"luaeval\"]:1: attempt to call a nil value (field 'xyz')"
@@ -343,7 +341,7 @@ func Test_lua_buffer_insert()
call assert_equal('4', luaeval('vim.buffer()[4]'))
call assert_equal(v:null, luaeval('vim.buffer()[5]'))
call assert_equal(v:null, luaeval('vim.buffer()[{}]'))
- if s:lua_543_or_later
+ if s:lua_543
let msg = "[string \"vim chunk\"]:1: method 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later
let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (method 'xyz')"
@@ -454,7 +452,7 @@ func Test_lua_list()
lua ll = vim.eval('l')
let x = luaeval("ll[3]")
call assert_equal(v:null, x)
- if s:lua_543_or_later
+ if s:lua_543
let msg = "[string \"luaeval\"]:1: method 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later
let msg = "[string \"luaeval\"]:1: attempt to call a nil value (method 'xyz')"
@@ -645,7 +643,7 @@ func Test_lua_blob()
call assert_equal(2, n)
let n = luaeval('lb[6]')
call assert_equal(v:null, n)
- if s:lua_543_or_later
+ if s:lua_543
let msg = "[string \"luaeval\"]:1: method 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later
let msg = "[string \"luaeval\"]:1: attempt to call a nil value (method 'xyz')"
diff --git a/src/version.c b/src/version.c
index 882fb0bf24..400f5787f9 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 */
/**/
+ 4243,
+/**/
4242,
/**/
4241,