[FarGroup/FarManager] master: LuaMacro: 1. Shmuel: fix for vanilla lua 5.1. (7ee9a5e29)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/7ee9a5e291835fd6892975ca48f2b064d7863915

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

commit 7ee9a5e291835fd6892975ca48f2b064d7863915
Author: Vadim Yegorov <z...@bmg.lv>
Date: Sun Mar 12 23:32:32 2023 +0200

LuaMacro:
1. Shmuel: fix for vanilla lua 5.1.


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

7ee9a5e291835fd6892975ca48f2b064d7863915
plugins/luamacro/_globalinfo.lua | 2 +-
plugins/luamacro/changelog | 4 ++++
plugins/luamacro/mbrowser.lua | 14 ++++++++------
plugins/luamacro/utils.lua | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
index 190e37b97..ef7fb18c0 100644
--- a/plugins/luamacro/_globalinfo.lua
+++ b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
function export.GetGlobalInfo()
return {
- Version = { 3, 0, 0, 772 },
+ Version = { 3, 0, 0, 773 },
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
index 604dfbac8..17520fefd 100644
--- a/plugins/luamacro/changelog
+++ b/plugins/luamacro/changelog
@@ -1,3 +1,7 @@
+zg 2023-03-12 23:26:44+02:00 - build 773
+
+1. Shmuel: fix for vanilla lua 5.1.
+
johnd0e 2023-03-07 15:59:00+01:00 - build 772

1. LuaFAR: update luautf8 library to 0.1.5
diff --git a/plugins/luamacro/mbrowser.lua b/plugins/luamacro/mbrowser.lua
index 47dd407d3..aea39d1f7 100644
--- a/plugins/luamacro/mbrowser.lua
+++ b/plugins/luamacro/mbrowser.lua
@@ -133,13 +133,15 @@ local function GetItems (fcomp, sortmark, onlyactive)
end
table.sort(columns, function(a,b) return (a.filemask or "*") < (b.filemask or "*") end)

- for m,mode in mf.EnumScripts("CustomSortModes") do
- m.mode = mode
- local source = debug.getinfo(m.Compare,"S").source
- m.FileName = source:match"^@(.+)"
- sortmodes[#sortmodes+1] = m
+ if Shared.panelsort then
+ for m,mode in mf.EnumScripts("CustomSortModes") do
+ m.mode = mode
+ local source = debug.getinfo(m.Compare,"S").source
+ m.FileName = source:match"^@(.+)"
+ sortmodes[#sortmodes+1] = m
+ end
+ table.sort(panels, function(a,b) return (a.Description or "") < (b.Description or "") end)
end
- table.sort(panels, function(a,b) return (a.Description or "") < (b.Description or "") end)

items[#items+1] = {
separator=true,
diff --git a/plugins/luamacro/utils.lua b/plugins/luamacro/utils.lua
index c2ca59e24..5ea303895 100644
--- a/plugins/luamacro/utils.lua
+++ b/plugins/luamacro/utils.lua
@@ -1234,7 +1234,7 @@ end

local function EnumScripts (ScriptType)
local ScriptOrigin = {
- CustomSortModes = Shared.panelsort.GetCustomSortModes(),
+ CustomSortModes = Shared.panelsort and Shared.panelsort.GetCustomSortModes(),
Event = LoadedMacros,
Macro = LoadedMacros,
MenuItem = AddedMenuItems,