Merge pull request #2654 from psychon/luajit-xpcall
gears.protected_call: Automatically detect xpcall features
This commit is contained in:
commit
710278c4b9
|
@ -23,7 +23,7 @@ local function handle_result(success, ...)
|
||||||
end
|
end
|
||||||
|
|
||||||
local do_pcall
|
local do_pcall
|
||||||
if _VERSION <= "Lua 5.1" then
|
if not select(2, xpcall(function(a) return a end, error, true)) then
|
||||||
-- Lua 5.1 doesn't support arguments in xpcall :-(
|
-- Lua 5.1 doesn't support arguments in xpcall :-(
|
||||||
do_pcall = function(func, ...)
|
do_pcall = function(func, ...)
|
||||||
local args = { ... }
|
local args = { ... }
|
||||||
|
|
Loading…
Reference in New Issue