Уточнение revision 14296.

FarGroup · Jun 26, 2016 · 1e3fb0e · 1e3fb0e
1 parent df2dbb9
commit 1e3fb0e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 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, 576 },
+    Version       = { 1, 0, 0, 577 },
     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 26.06.2016 16:39:39 +0200 - build 576
+shmuel 26.06.2016 19:28:14 +0200 - build 577
+
+1. Уточнение 576.2.
+
+shmuel 26.06.2016 16:39:39 +0200 - build 576
 
 1. Расширение возможностей функции Panel.SetCustomSortMode().
 

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

diff --git a/plugins/luamacro/panelsort.lua b/plugins/luamacro/panelsort.lua
@@ -118,10 +118,6 @@ local function CanDoPanelSort (SortMode)
   end
 end
 
---	SO_AUTO,
---	SO_KEEPCURRENT,
---	SO_DIRECT,
---	SO_REVERSE,
 local function SetCustomSortMode (nMode, whatpanel, order)
   if CanChangeSortMode then
     if CanDoPanelSort(nMode) then
@@ -162,7 +158,7 @@ local function CustomSortMenu()
   table.sort(items, function(a,b) return a.Mode < b.Mode end)
   local r, pos = far.Menu({Title=Msg.PSMenuTitle, Id=Id}, items, bkeys)
   if r and (pos > 0) then
-    local apanel = not r.BreakKey or r.BreakKey:find("^CS%+") or not r.BreakKey:find("+")
+    local apanel = not r.BreakKey or r.BreakKey:find("^CS%+") or not r.BreakKey:find("%+")
     local ppanel = r.BreakKey and r.BreakKey:find("^CS?%+")
     if ppanel then SetCustomSortMode(items[pos].Mode, 1, r.order) end
     if apanel then SetCustomSortMode(items[pos].Mode, 0, r.order) end