From 51bfd53e48d5310eb786069b758e0430129daf54 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Mon, 12 Dec 2011 08:08:18 -0500
Subject: Updated to Lua 5.2.

---
 modules/textadept/command_entry.lua | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'modules/textadept/command_entry.lua')

diff --git a/modules/textadept/command_entry.lua b/modules/textadept/command_entry.lua
index b574f9dd..3590c2cb 100644
--- a/modules/textadept/command_entry.lua
+++ b/modules/textadept/command_entry.lua
@@ -27,10 +27,10 @@ local env = setmetatable({}, {
 
 -- Execute a Lua command.
 events.connect(events.COMMAND_ENTRY_COMMAND, function(command)
-  local f, err = loadstring(command)
+  local f, err = load(command, nil, 'bt', env)
   if err then error(err) end
   gui.command_entry.focus() -- toggle focus to hide
-  setfenv(f, env)()
+  f()
   events.emit(events.UPDATE_UI)
 end)
 
@@ -41,8 +41,7 @@ events.connect(events.COMMAND_ENTRY_KEYPRESS, function(code)
   elseif keys.KEYSYMS[code] == '\t' then
     local substring = gui.command_entry.entry_text:match('[%w_.:]+$') or ''
     local path, o, prefix = substring:match('^([%w_.:]-)([.:]?)([%w_]*)$')
-    local f, err = loadstring('return ('..path..')')
-    if type(f) == "function" then setfenv(f, env) end
+    local f, err = load('return ('..path..')', nil, 'bt', env)
     local ok, tbl = pcall(f)
     local cmpls = {}
     prefix = '^'..prefix
-- 
cgit v1.2.3