aboutsummaryrefslogtreecommitdiff
path: root/core/keys.lua
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2011-12-12 08:08:18 -0500
committermitchell <70453897+667e-11@users.noreply.github.com>2011-12-12 08:08:18 -0500
commit51bfd53e48d5310eb786069b758e0430129daf54 (patch)
tree15eedf68fad753b1fad5184c4d018bfced1e4001 /core/keys.lua
parentdfacbd6a183f6b09498f589e20f146cbbf332e88 (diff)
downloadtextadept-51bfd53e48d5310eb786069b758e0430129daf54.tar.gz
textadept-51bfd53e48d5310eb786069b758e0430129daf54.zip
Updated to Lua 5.2.
Diffstat (limited to 'core/keys.lua')
-rw-r--r--core/keys.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/keys.lua b/core/keys.lua
index 4d1ccf48..61d8ba55 100644
--- a/core/keys.lua
+++ b/core/keys.lua
@@ -107,7 +107,8 @@ LANGUAGE_MODULE_PREFIX = (not OSX and CTRL or META)..'l'
local OSX = OSX
local string = string
local string_byte, string_char = string.byte, string.char
-local xpcall, next, type, unpack = xpcall, next, type, unpack
+local table_unpack = table.unpack
+local xpcall, next, type = xpcall, next, type
local no_args = {}
local getmetatable = getmetatable
local error = function(e) events.emit(events.ERROR, e) end
@@ -164,7 +165,7 @@ local function run_command(command, command_type)
end
end
end
- local _, result = xpcall(function() return f(unpack(args, 2)) end, error)
+ local _, result = xpcall(f, error, table_unpack(args, 2))
return result
end
_M.run_command = run_command -- export for menu.lua without creating LuaDoc