Fix lm:about

FarGroup · Oct 20, 2023 · aa19cce · aa19cce
1 parent c11ef69
commit aa19cce
Show file tree

Hide file tree

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

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,3 +1,7 @@
+shmuel 2023-10-21 01:02:22+03:00 - build 782
+
+1. Fix lm:about for new LPeg versions
+
 johnd0e 2023-09-15 10:00:00+02:00 - build 781
 
 1. LuaFAR: update luautf8 library to 0.1.5-3-gf736301

diff --git a/plugins/luamacro/luafar/version.h b/plugins/luamacro/luafar/version.h
@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 781
+#define PLUGIN_BUILD 782
diff --git a/plugins/luamacro/luamacro.lua b/plugins/luamacro/luamacro.lua
@@ -318,7 +318,10 @@ local function About()
   local ok,lib = pcall(require, "moonscript.version")
   if ok then
     text = text.."\nMoonScript "..lib.version
-    if lpeg then text = text.."\nLPeg "..lpeg.version() end
+    if lpeg then
+      local v = lpeg.version
+      text = text.."\n"..(type(v)=="function" and "LPeg "..v() or v) -- depends on LPeg version
+    end
   end
 
   -- All together