[FarGroup/FarManager] master: LuaMacro: fix incorrect error message (6f52b2ba1)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Nov 9, 2025, 1:45:56 AM (7 days ago) Nov 9
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/6f52b2ba138e7b7d4c18cd4d88c19f47ce8778ab

>---------------------------------------------------------------

commit 6f52b2ba138e7b7d4c18cd4d88c19f47ce8778ab
Author: Shmuel Zeigerman <solo...@gmail.com>
Date: Sun Nov 9 08:43:46 2025 +0200

LuaMacro: fix incorrect error message


>---------------------------------------------------------------

6f52b2ba138e7b7d4c18cd4d88c19f47ce8778ab
plugins/luamacro/_globalinfo.lua | 2 +-
plugins/luamacro/changelog | 4 ++++
plugins/luamacro/luafar/lf_version.h | 2 +-
plugins/luamacro/utils.lua | 3 ++-
4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
index 50ec2f3c2..dcdabb2a7 100644
--- a/plugins/luamacro/_globalinfo.lua
+++ b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
function export.GetGlobalInfo()
return {
- Version = { 3, 0, 0, 902 },
+ Version = { 3, 0, 0, 903 },
MinFarVersion = { 3, 0, 0, 6564 },
Guid = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
Title = "LuaMacro",
diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
index a8a65e46e..b0ad232da 100644
--- a/plugins/luamacro/changelog
+++ b/plugins/luamacro/changelog
@@ -1,3 +1,7 @@
+shmuel 2025-11-09 08:37:33+02:00 - build 903
+
+1. Fix incorrect error message (since build 881).
+
shmuel 2025-11-07 08:50:00+02:00 - build 902

1. Enable mf.usermenu for Far started with -e or -v.
diff --git a/plugins/luamacro/luafar/lf_version.h b/plugins/luamacro/luafar/lf_version.h
index e2265e362..cdc2c82fb 100644
--- a/plugins/luamacro/luafar/lf_version.h
+++ b/plugins/luamacro/luafar/lf_version.h
@@ -1,3 +1,3 @@
#include <farversion.hpp>

-#define PLUGIN_BUILD 902
+#define PLUGIN_BUILD 903
diff --git a/plugins/luamacro/utils.lua b/plugins/luamacro/utils.lua
index 5e51e8715..b21e9187a 100644
--- a/plugins/luamacro/utils.lua
+++ b/plugins/luamacro/utils.lua
@@ -756,7 +756,8 @@ local function LoadMacros (unload, paths)
local f, msg = (isMoonScript and moonscript.loadfile or loadfile)(FullPath)
if not f then
numerrors=numerrors+1
- msg = ('Error in MoonScript file: %s\n%s'):format(FullPath, string.gsub(msg, "\n\t", "\n "))
+ msg = ('Error in %s file: %s\n%s'):format(isMoonScript and "MoonScript" or "Lua",
+ FullPath, string.gsub(msg, "\n\t", "\n "))
ErrMsgLoad(msg,FullPath,isMoonScript,"compile")
return
end


Reply all
Reply to author
Forward
0 new messages