Diff

core/modulemanager.lua @ 7164:af26e8eb591f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 Feb 2016 15:00:17 +0100
parent 7163:eadbf19d0de0
child 7303:439d00063620
line wrap: on
line diff
--- a/core/modulemanager.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/modulemanager.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -23,7 +23,8 @@
 local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
 
 local debug_traceback = debug.traceback;
-local unpack, select = unpack, select;
+local select = select;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
 local pcall = function(f, ...)
 	local n = select("#", ...);
 	local params = {...};