Updated to Lua 5.4.2.

3 files changed, 26 insertions, 12 deletions

diff --git a/src/Makefile b/src/Makefile
index 889e8d9e..d92b40dc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -133,8 +133,8 @@ textadept_objs = $(textadept_gtk_objs) $(textadept_curses_objs)
 lua_objs = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o \
            linit.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o \
            lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o \
-           lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
-           lmathlib.o loadlib.o lstrlib.o ltablib.o lutf8lib.o
+           lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o \
+           loadlib.o lstrlib.o ltablib.o lutf8lib.o
 lua_oslib_objs = loslib.o loslib-curses.o
 lua_lib_objs = lpcap.o lpcode.o lpprint.o lptree.o lpvm.o lfs.o
 gtdialog_objs = gtdialog.o gtdialog-curses.o
@@ -385,7 +385,7 @@ endif
 scintilla_tgz = scintilla445.tgz
 scinterm_zip = 6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip
 scintillua_zip = scintillua_4.4.5-2.zip
-lua_tgz = lua-5.3.5.tar.gz
+lua_tgz = lua-5.4.2.tar.gz
 lpeg_tgz = lpeg-1.0.2.tar.gz
 lfs_zip = v1_8_0.zip
 gtdialog_zip = 64587546482a1a6324706d75c80b77d2f87118a4.zip
diff --git a/src/lua.patch b/src/lua.patch
index dff7fd66..8955e581 100644
--- a/src/lua.patch
+++ b/src/lua.patch
@@ -9,18 +9,22 @@ Added os.spawn() for spawning and interacting with asynchronous processes.
 diff -r 8a23edc91533 src/luaconf.h
 --- a/src/luaconf.h	Mon Jan 12 18:57:53 2015 -0500
 +++ b/src/luaconf.h	Mon Jan 12 23:50:08 2015 -0500
-@@ -166,24 +166,22 @@
+@@ -166,34 +166,32 @@
  #define LUA_PATH_DEFAULT  \
  		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
  		LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" \
 -		LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
 -		".\\?.lua;" ".\\?\\init.lua"
 +		LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;"
+ #endif
+ 
+ #if !defined(LUA_CPATH_DEFAULT)
  #define LUA_CPATH_DEFAULT \
  		LUA_CDIR"?.dll;" \
  		LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
 -		LUA_CDIR"loadall.dll;" ".\\?.dll"
 +		LUA_CDIR"loadall.dll;"
+ #endif
  
  #else			/* }{ */
  
@@ -28,14 +32,21 @@ diff -r 8a23edc91533 src/luaconf.h
 +#define LUA_ROOT	"/usr/"
  #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
  #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+ 
+ #if !defined(LUA_PATH_DEFAULT)
  #define LUA_PATH_DEFAULT  \
  		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
 -		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
 -		"./?.lua;" "./?/init.lua"
 +		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;"
+ #endif
+ 
+ #if !defined(LUA_CPATH_DEFAULT)
  #define LUA_CPATH_DEFAULT \
 -		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
 +		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;"
+ #endif
+ 
  #endif			/* } */
  
  
diff --git a/src/lua.sym b/src/lua.sym
index 0e2914d3..bce40c00 100644
--- a/src/lua.sym
+++ b/src/lua.sym
@@ -1,4 +1,4 @@
-# Lua 5.3 symbols to retain. (LUA_API, LUALIB_API, LUAMOD_API)
+# Lua 5.4 symbols to retain. (LUA_API, LUALIB_API, LUAMOD_API)
 lua_absindex
 lua_arith
 lua_atpanic
@@ -20,13 +20,13 @@ lua_gethookcount
 lua_gethookmask
 lua_geti
 lua_getinfo
+lua_getiuservalue
 lua_getlocal
 lua_getmetatable
 lua_getstack
 lua_gettable
 lua_gettop
 lua_getupvalue
-lua_getuservalue
 lua_iscfunction
 lua_isinteger
 lua_isnumber
@@ -37,7 +37,7 @@ lua_len
 lua_load
 lua_newstate
 lua_newthread
-lua_newuserdata
+lua_newuserdatauv
 lua_next
 lua_pcallk
 lua_pushboolean
@@ -60,6 +60,7 @@ lua_rawlen
 lua_rawset
 lua_rawseti
 lua_rawsetp
+lua_resetthread
 lua_resume
 lua_rotate
 lua_setallocf
@@ -67,16 +68,18 @@ lua_setfield
 lua_setglobal
 lua_sethook
 lua_seti
+lua_setiuservalue
 lua_setlocal
 lua_setmetatable
 lua_settable
 lua_settop
 lua_setupvalue
-lua_setuservalue
+lua_setwarnf
 lua_status
 lua_stringtonumber
 lua_toboolean
 lua_tocfunction
+lua_toclose
 lua_tointegerx
 lua_tolstring
 lua_tonumberx
@@ -88,8 +91,10 @@ lua_typename
 lua_upvalueid
 lua_upvaluejoin
 lua_version
+lua_warning
 lua_xmove
 lua_yieldk
+luaL_addgsub
 luaL_addlstring
 luaL_addstring
 luaL_addvalue
@@ -105,7 +110,7 @@ luaL_checkoption
 luaL_checkstack
 luaL_checktype
 luaL_checkudata
-luaL_checkversion_
+luaL_checkversion
 luaL_error
 luaL_execresult
 luaL_fileresult
@@ -118,13 +123,11 @@ luaL_loadfilex
 luaL_loadstring
 luaL_newmetatable
 luaL_newstate
-luaL_openlib
 luaL_openlibs
 luaL_optinteger
 luaL_optlstring
 luaL_optnumber
 luaL_prepbuffsize
-luaL_pushmodule
 luaL_pushresult
 luaL_pushresultsize
 luaL_ref
@@ -134,10 +137,10 @@ luaL_setmetatable
 luaL_testudata
 luaL_tolstring
 luaL_traceback
+luaL_typeerror
 luaL_unref
 luaL_where
 luaopen_base
-luaopen_bit32
 luaopen_coroutine
 luaopen_debug
 luaopen_io