Уточнения revision 14342-14343.

FarGroup · Aug 13, 2016 · 0f6fafc · 0f6fafc
1 parent 99cb5e2
commit 0f6fafc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 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, 580 },
+    Version       = { 1, 0, 0, 581 },
     MinFarVersion = { 3, 0, 0, 4582 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 18.07.2016 17:55:32 +0200 - build 580.
+shmuel 13.08.2016 18:24:05 +0200 - build 581
+
+1. Уточнения 579,580.
+
+shmuel 18.07.2016 17:55:32 +0200 - build 580
 
 1. Макро-браузер отображает поле "id" в диалоге информации о макросе.
 

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

diff --git a/plugins/luamacro/mbrowser.lua b/plugins/luamacro/mbrowser.lua
@@ -151,15 +151,16 @@ action      │ %s
 code        │ %s
 id          │ %s
 %s
-%s]]) :format(m.description or "id="..m.id,
+%s]]) :format(m.description or "index="..m.index,
               m.area,
               m.key,
               utils.FlagsToString(m.flags),
-              m.filemask or "", m.priority or "",
+              m.filemask or "",
+              m.priority or "",
               m.condition and tostring(m.condition) or "",
               m.action and tostring(m.action) or "",
               code,
-              m.id,
+              m.id or "",
               "\1",
               m.FileName or "<"..Msg.MBNoFileNameAvail..">")
     far.Message(str,Msg.MBTitleMacro,nil,"l")