Skip to content

Commit

Permalink
Откат revision 13496. Данный вид события может быть получен имеющимис…
Browse files Browse the repository at this point in the history
…я средствами (mf.postmacro() из макрофайла).
  • Loading branch information
shmuz committed Nov 1, 2015
1 parent dc7b441 commit cf2b063
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 19 deletions.
10 changes: 4 additions & 6 deletions enc/enc_lua/macroapi_manual.en.tsi
Expand Up @@ -1762,7 +1762,7 @@ lv=2
dt=Text
nm=Event handlers
ctime=3580139337
mtime=3655482501
mtime=3655200145
<article>
#_<markdown>
#_
Expand All @@ -1782,18 +1782,16 @@ mtime=3655482501
#_```
#_
#_The field `group` can have one of the following values:<br>
#_`"DialogEvent", "EditorEvent", "EditorInput", "ExitFAR", "ViewerEvent", "ConsoleInput", "MacrosLoaded"`.<br>
#_These names (except `MacrosLoaded`) are derived from names of the corresponding functions, exported by the plugin, e.g.:<br>
#_`"DialogEvent", "EditorEvent", "EditorInput", "ExitFAR", "ViewerEvent", "ConsoleInput"`.<br>
#_These names are derived from names of the corresponding functions, exported by the plugin, e.g.:<br>
#_ export.ProcessDialogEvent -> DialogEvent
#_The functions `condition` and `action` are called with the same parameters as the corresponding exported functions are called (see LuaFAR manual).
#_
#_When there are multiple event handlers for the same event (i.e. handlers with the same `group` value), these handlers will be called one after one: a handler having higher priority is called first. Priorities are evaluated dynamically accounting for `condition()` results if any, the same way it is done for macros.
#_
#_The `ExitFAR` handlers are called in the following cases: (a) exit from Far Manager,
#_The `ExitFAR` handler is called in the following cases: (a) exit from Far Manager,
#_(b) unloading LuaMacro plugin, \(c) unloading or reloading macros.
#_
#_The `MacrosLoaded` handlers are called after loading/reloading of macrofiles is finished. Their `condition` and `action` functions get no arguments.
#_
#_[1]: 75.html
#_
#_@@@
Expand Down
11 changes: 5 additions & 6 deletions enc/enc_lua/macroapi_manual.ru.tsi
Expand Up @@ -1756,7 +1756,7 @@ lv=2
dt=Text
nm=����������� �������
ctime=3580139337
mtime=3655482883
mtime=3655200078
<article>
#_<markdown>
#_
Expand All @@ -1776,16 +1776,15 @@ mtime=3655482883
#_```
#_
#_���� `group` ����� ����� ���� �� ��������� ��������:<br>
#_`"DialogEvent", "EditorEvent", "EditorInput", "ExitFAR", "ViewerEvent", "ConsoleInput", "MacrosLoaded"`.<br>
#_������ ����� (����� `MacrosLoaded`) �������� ������������ �� ��� ��������������� �������, �������������� ��������, ��������:<br>
#_`"DialogEvent", "EditorEvent", "EditorInput", "ExitFAR", "ViewerEvent", "ConsoleInput"`.<br>
#_������ ����� �������� ������������ �� ��� ��������������� �������, �������������� ��������, ��������:<br>
#_ export.ProcessDialogEvent -> DialogEvent
#_������� `condition` � `action` ����������� ���������� � ���� �� �����������, � �������� ���������� ��������������� �������������� ������� (��. ������ LuaFAR).
#_
#_��� ������� ���������� ������������ ������ � ���� �� ������� (�.�. ������������ � ���������� ����� `group`), ��� ����������� ����� ������� �� �������: ���������� � ����� ������� ����������� ���������� ������. ��������� ������������ ����������� � ������ ������� `condition`, ���� ������� �������, ��� � ��� ��������.
#_
#_����������� `ExitFAR` ���������� � ��������� �������: (a) ����� �� Far Manager, (b) �������� ������� LuaMacro, \(c) �������� ���� ������������ ��������.
#_
#_����������� `MacrosLoaded` ���������� �� ���������� ��������/������������ �����������. �� ������� `condition` � `action` ���������� ��� ����������.
#_������� `"ExitFAR"` ���������� � ��������� �������: (a) ����� �� Far Manager,
#_(b) �������� ������� LuaMacro, \(c) �������� ���� ������������ ��������.
#_
#_[1]: 75.html
#_
Expand Down
2 changes: 1 addition & 1 deletion plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
function export.GetGlobalInfo()
return {
Version = { 1, 0, 0, 541 },
Version = { 1, 0, 0, 542 },
MinFarVersion = { 3, 0, 0, 4450 },
Guid = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
Title = "LuaMacro",
Expand Down
6 changes: 5 additions & 1 deletion plugins/luamacro/changelog
@@ -1,4 +1,8 @@
shmuel 31.10.2015 22:34:42 +0200 - build 541
shmuel 01.11.2015 14:10:39 +0200 - build 542

1. Откат 540-541. Данный вид события может быть получен имеющимися средствами (mf.postmacro() из макрофайла).

shmuel 31.10.2015 22:34:42 +0200 - build 541

1. Уточнение 540.

Expand Down
2 changes: 1 addition & 1 deletion plugins/luamacro/luamacro.rc
@@ -1,6 +1,6 @@
#include <farversion.hpp>

#define PLUGIN_BUILD 541
#define PLUGIN_BUILD 542
#define PLUGIN_DESC "Lua Macros for Far Manager"
#define PLUGIN_NAME "LuaMacro"
#define PLUGIN_FILENAME "luamacro.dll"
Expand Down
5 changes: 1 addition & 4 deletions plugins/luamacro/utils.lua
Expand Up @@ -57,8 +57,7 @@ local LoadMacrosDone
local LoadingInProgress
local EnumState = {}
local Events
local EventGroups = {"dialogevent","editorevent","editorinput","exitfar","viewerevent", "consoleinput",
"macrosloaded"}
local EventGroups = {"dialogevent","editorevent","editorinput","exitfar","viewerevent", "consoleinput"}
local AddedMenuItems
local AddedPrefixes

Expand Down Expand Up @@ -766,8 +765,6 @@ local function LoadMacros (unload, paths)
export.ProcessViewerEvent = Events.viewerevent[1] and export_ProcessViewerEvent
export.ProcessConsoleInput = Events.consoleinput[1] and export_ProcessConsoleInput

local ok, msg = pcall(EV_Handler, Events.macrosloaded)
if not ok then ErrMsg(msg) end
LoadMacrosDone = true
end

Expand Down

0 comments on commit cf2b063

Please sign in to comment.