To: vim_dev@googlegroups.com Subject: Patch 8.2.1212 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1212 Problem: Cannot build with Lua 5.4. Solution: Use luaL_typeerror instead defining it. (closes #6452) Files: src/if_lua.c *** ../vim-8.2.1211/src/if_lua.c 2020-07-02 21:17:52.523035495 +0200 --- src/if_lua.c 2020-07-14 21:51:22.415595179 +0200 *************** *** 120,125 **** --- 120,128 ---- #define luaL_loadbufferx dll_luaL_loadbufferx #define luaL_argerror dll_luaL_argerror #endif + #if LUA_VERSION_NUM >= 504 + #define luaL_typeerror dll_luaL_typeerror + #endif #define luaL_checkany dll_luaL_checkany #define luaL_checklstring dll_luaL_checklstring #define luaL_checkinteger dll_luaL_checkinteger *************** *** 217,222 **** --- 220,228 ---- int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode); int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg); #endif + #if LUA_VERSION_NUM >= 504 + int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname); + #endif void (*dll_luaL_checkany) (lua_State *L, int narg); const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l); lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg); *************** *** 336,341 **** --- 342,350 ---- {"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx}, {"luaL_argerror", (luaV_function) &dll_luaL_argerror}, #endif + #if LUA_VERSION_NUM >= 504 + {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror}, + #endif {"luaL_checkany", (luaV_function) &dll_luaL_checkany}, {"luaL_checklstring", (luaV_function) &dll_luaL_checklstring}, {"luaL_checkinteger", (luaV_function) &dll_luaL_checkinteger}, *************** *** 457,463 **** } #endif ! #if LUA_VERSION_NUM > 501 static int luaL_typeerror(lua_State *L, int narg, const char *tname) { --- 466,472 ---- } #endif ! #if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504 static int luaL_typeerror(lua_State *L, int narg, const char *tname) { *** ../vim-8.2.1211/src/version.c 2020-07-14 21:22:26.763794360 +0200 --- src/version.c 2020-07-14 21:52:48.843373063 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1212, /**/ -- How To Keep A Healthy Level Of Insanity: 8. Don't use any punctuation marks. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///