Флаг KMFLAGS_SILENTCHECK игнорировался в команде MCCS_POST.

FarGroup · Aug 23, 2017 · 82a4961 · 82a4961
1 parent 0dfe809
commit 82a4961
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+shmuel 23.08.2017 12:57:35 +0200 - build 5012
+
+1. Флаг KMFLAGS_SILENTCHECK игнорировался в команде MCCS_POST.
+
 drkns 18.08.2017 09:30:57 +0000 - build 5011
 
 1. Не работало центрирование кнопок в диалоге поиска при изменении размера.

diff --git a/far/macro.cpp b/far/macro.cpp
@@ -929,11 +929,12 @@ bool KeyMacro::DelMacro(const GUID& PluginId,void* Id)
 bool KeyMacro::PostNewMacro(const wchar_t* Sequence,FARKEYMACROFLAGS InputFlags,DWORD AKey)
 {
 	const wchar_t* Lang = GetMacroLanguage(InputFlags);
+	bool onlyCheck = (InputFlags & KMFLAGS_SILENTCHECK) != 0;
 	MACROFLAGS_MFLAGS Flags = MFLAGS_POSTFROMPLUGIN;
 	if (InputFlags & KMFLAGS_ENABLEOUTPUT)        Flags |= MFLAGS_ENABLEOUTPUT;
 	if (InputFlags & KMFLAGS_NOSENDKEYSTOPLUGINS) Flags |= MFLAGS_NOSENDKEYSTOPLUGINS;
 
-	FarMacroValue values[]={7.0,Lang,Sequence,(double)Flags,(double)AKey};
+	FarMacroValue values[]={7.0,Lang,Sequence,(double)Flags,(double)AKey,onlyCheck};
 	FarMacroCall fmc={sizeof(FarMacroCall),std::size(values),values,nullptr,nullptr};
 	OpenMacroPluginInfo info={MCT_KEYMACRO,&fmc};
 	return CallMacroPlugin(&info);

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,5011)m4_dnl
+m4_define(BUILD,5012)m4_dnl
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,7 +1,7 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 1, 0, 0, 613 },
-    MinFarVersion = { 3, 0, 0, 4996 },
+    Version       = { 1, 0, 0, 614 },
+    MinFarVersion = { 3, 0, 0, 5012 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",
     Description   = "Far macros in Lua",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 17.08.2017 16:44:24 +0200 - build 613
+shmuel 23.08.2017 13:06:35 +0200 - build 614
+
+1. Флаг KMFLAGS_SILENTCHECK игнорировался в команде MCCS_POST.
+
+shmuel 17.08.2017 16:44:24 +0200 - build 613
 
 1. LuaFAR: возвращаемые значения DM_LISTSETCURPOS теперь отсчитываются от 1.
 

diff --git a/plugins/luamacro/keymacro.lua b/plugins/luamacro/keymacro.lua
@@ -437,12 +437,12 @@ function KeyMacro.Dispatch (opcode, ...)
   elseif opcode == OP_ISPOSTMACROENABLED then
     return not (IsExecuting() and GetCurMacro()) and 1 or 0
   elseif opcode == OP_POSTNEWMACRO then -- from API MacroControl(MSSC_POST)
-    local Lang,Code,Flags,AKey = ...
+    local Lang,Code,Flags,AKey,onlyCheck = ...
     local f1,f2 = loadmacro(Lang,Code)
     if f1 then
       CurState.MacroQueue:add(NewMacroRecord({ f1,f2,HasFunction=true },Flags,AKey))
       return true
-    else
+    elseif not onlyCheck then
       ErrMsg(f2, Msg.MMacroParseErrorTitle)
     end
   elseif opcode == OP_SETMACROVALUE then

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