M#3515: eval("@filename"): в окружение не добавляется _filename

FarGroup · Oct 13, 2017 · c4b09af · c4b09af
1 parent 38919e5
commit c4b09af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 1, 0, 0, 624 },
+    Version       = { 1, 0, 0, 625 },
     MinFarVersion = { 3, 0, 0, 5063 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-zg 13.10.2017 13:36:39 +0300 - build 624
+shmuel 13.10.2017 21:28:18 +0200 - build 625
+
+1. M#3515: eval("@filename"): в окружение не добавляется _filename
+
+zg 13.10.2017 13:36:39 +0300 - build 624
 
 1. у DN_GOTFOCUS и DN_KILLFOCUS Param1 = -1, если они приходят при получении или потере диалогом фокуса.
 

diff --git a/plugins/luamacro/luamacro.lua b/plugins/luamacro/luamacro.lua
@@ -189,7 +189,8 @@ local function loadmacro (Lang, Text, Env, ConvertPath)
 
   if f1 then
     strParseError = ""
-    Env = Env or setmetatable({_filename=fname}, gmeta)
+    Env = Env or setmetatable({}, gmeta)
+    Env._filename = fname
     setfenv(f1, Env)
     if f2 then setfenv(f2, Env) end
     return f1,f2

diff --git a/plugins/luamacro/luamacro.rc b/plugins/luamacro/luamacro.rc
@@ -1,6 +1,6 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 624
+#define PLUGIN_BUILD 625
 #define PLUGIN_DESC "Lua Macros for Far Manager"
 #define PLUGIN_NAME "LuaMacro"
 #define PLUGIN_FILENAME "luamacro.dll"