Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 6753)
+++ plugins.hpp	(working copy)
@@ -230,6 +230,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginMenu(const GUID& Guid, const GUID& ItemGuid);
 		Plugin *FindPlugin(const GUID& SysID);
 		INT_PTR PluginGuidToPluginNumber(const GUID& PluginId);
 
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 6753)
+++ plugins.cpp	(working copy)
@@ -2268,6 +2268,94 @@
 	return FALSE;
 }
 
+int PluginManager::CallPluginMenu(const GUID& Guid, const GUID& ItemGuid)
+{
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->HasOpenPanel())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			bool bCached = pPlugin->CheckWorkFlags(PIWF_CACHED)?true:false;
+			UINT64 IFlags;
+			unsigned __int64 id = 0;
+
+			if (bCached)
+			{
+				id = PlCacheCfg->GetCacheID(pPlugin->GetCacheName());
+				IFlags = PlCacheCfg->GetFlags(id);
+			}
+			else
+			{
+				PluginInfo Info = {sizeof(Info)};
+				if (!pPlugin->GetPluginInfo(&Info))
+					return FALSE;
+				else
+					IFlags = Info.Flags;
+			}
+
+			if ((Editor && !(IFlags & PF_EDITOR)) ||
+					(Viewer && !(IFlags & PF_VIEWER)) ||
+					(Dialog && !(IFlags & PF_DIALOG)) ||
+					(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+				return FALSE;
+
+			Panel *ActivePanel=CtrlObject->Cp()->ActivePanel;
+			int OpenCode=OPEN_PLUGINSMENU;
+			INT_PTR Item=0;
+			OpenDlgPluginData pd;
+
+			if (Editor)
+			{
+				OpenCode=OPEN_EDITOR;
+			}
+			else if (Viewer)
+			{
+				OpenCode=OPEN_VIEWER;
+			}
+			else if (Dialog)
+			{
+				OpenCode=OPEN_DIALOG;
+				pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+				Item=(INT_PTR)&pd;
+			}
+
+			HANDLE hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+			if (hPlugin!=INVALID_HANDLE_VALUE && !Editor && !Viewer && !Dialog)
+			{
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+
+			// CtrlObject->Macro.SetMode(PrevMacroMode); -- ���� ���������/�������������� �����������?
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;
Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 6753)
+++ macroopcode.hpp	(working copy)
@@ -224,6 +224,7 @@
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
+	MCODE_F_PLUGIN_MENU,              // N=Plugin.Menu(Guid,MenuGuid)
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
 
Index: macro.cpp
===================================================================
--- macro.cpp	(revision 6753)
+++ macro.cpp	(working copy)
@@ -360,6 +360,7 @@
 static bool xlatFunc(const TMacroFunction*);
 static bool pluginloadFunc(const TMacroFunction*);
 static bool pluginunloadFunc(const TMacroFunction*);
+static bool pluginmenuFunc(const TMacroFunction*);
 
 static bool __CheckCondForSkip(DWORD Op);
 
@@ -435,6 +436,7 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,        3, 0},
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,      2, 1},
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,    1, 0},
+	{L"PLUGIN.MENU",      nullptr, L"N=Plugin.Menu(Guid,MenuGuid)",                              pluginmenuFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_MENU,      2, 0},
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,            1, 0},
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,           5, 5},
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,          5, 2},
@@ -4376,7 +4378,30 @@
 	return Ret.i()!=0;
 }
 
+// N=Plugin.Menu(Guid,MenuGuid)
+static bool pluginmenuFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
 
+	if (StrToGuid(Guid.s(),guid) && StrToGuid(MenuGuid.s(),menuGuid) && CtrlObject->Plugins.FindPlugin(guid))
+	{
+		//if( Opt.Macro.CallPluginRules )
+		//	CtrlObject->Macro.PushState(true);
+
+		Ret=(__int64)CtrlObject->Plugins.CallPluginMenu(guid,menuGuid);
+
+		//if( Opt.Macro.CallPluginRules )
+		//	CtrlObject->Macro.PopState();
+	}
+
+	VMStack.Push(Ret);
+	return Ret?true:false;
+}
+
+
 // V=callplugin(SysID[,param])
 #if 0
 static bool callpluginFunc(const TMacroFunction*)

Index: macro.cpp
===================================================================
--- macro.cpp	(revision 6767)
+++ macro.cpp	(working copy)
@@ -360,6 +360,8 @@
 static bool xlatFunc(const TMacroFunction*);
 static bool pluginloadFunc(const TMacroFunction*);
 static bool pluginunloadFunc(const TMacroFunction*);
+static bool plugincallFunc(const TMacroFunction*);
+static bool pluginconfigFunc(const TMacroFunction*);
 
 static bool __CheckCondForSkip(DWORD Op);
 
@@ -435,6 +437,8 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,        3, 0},
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,      2, 1},
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,    1, 0},
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid,MenuGuid)",                              plugincallFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,      2, 0},
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          pluginconfigFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,    2, 1},
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,            1, 0},
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,           5, 5},
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,          5, 2},
@@ -4376,7 +4380,68 @@
 	return Ret.i()!=0;
 }
 
+// N=Plugin.Call(Guid,MenuGuid)
+static bool plugincallFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
 
+	if (StrToGuid(Guid.s(),guid) && StrToGuid(MenuGuid.s(),menuGuid) && CtrlObject->Plugins.FindPlugin(guid))
+	{
+		Ret=(__int64)CtrlObject->Plugins.CallPluginItem(guid,menuGuid);
+	}
+
+	VMStack.Push(Ret);
+	return true; //Ret?true:false;
+}
+
+// N=Plugin.Config(Guid[,MenuGuid])
+static bool pluginconfigFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
+	int curType = FrameManager->GetCurrentFrame()->GetType();
+
+	if (curType==MODALTYPE_PANELS && StrToGuid(Guid.s(),guid))
+	{
+		Plugin* pPlugin = CtrlObject->Plugins.FindPlugin(guid);
+		if (pPlugin && pPlugin->HasConfigure())
+		{
+			if (MenuGuid.isUnknown() || !StrToGuid(MenuGuid.s(),menuGuid))
+			{
+				menuGuid = FarGuid;
+				Ret=1;
+			}
+			else
+			{
+				PluginInfo Info = {sizeof(Info)};
+				if (pPlugin->GetPluginInfo(&Info))
+				{
+					for (int i = 0; i < Info.PluginConfig.Count; i++)
+					{
+						if (memcmp(&menuGuid,&(Info.PluginConfig.Guids[i]),sizeof(GUID)) == 0)
+						{
+							Ret=1;
+							break;
+						}
+					}
+				}
+			}
+		
+			if (Ret)
+				CtrlObject->Plugins.ConfigureCurrent(pPlugin,menuGuid);
+		}
+	}
+
+	VMStack.Push(Ret);
+	return true;
+}
+
+
 // V=callplugin(SysID[,param])
 #if 0
 static bool callpluginFunc(const TMacroFunction*)
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 6767)
+++ plugins.cpp	(working copy)
@@ -2243,6 +2243,95 @@
 	return FALSE;
 }
 
+int PluginManager::CallPluginItem(const GUID& Guid, const GUID& ItemGuid)
+{
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->HasOpenPanel())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			if ((Editor && !(IFlags & PF_EDITOR)) ||
+					(Viewer && !(IFlags & PF_VIEWER)) ||
+					(Dialog && !(IFlags & PF_DIALOG)) ||
+					(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+				return FALSE;
+
+			bool ItemFound = false;
+			for (int i = 0; i < Info.PluginMenu.Count; i++)
+			{
+				if (memcmp(&ItemGuid,&(Info.PluginMenu.Guids[i]),sizeof(GUID)) == 0)
+				{
+					ItemFound = true;
+					break;
+				}
+			}
+			if (!ItemFound)
+				return FALSE;
+				
+			Panel *ActivePanel=CtrlObject->Cp()->ActivePanel;
+			int OpenCode=OPEN_PLUGINSMENU;
+			INT_PTR Item=0;
+			OpenDlgPluginData pd;
+
+			if (Editor)
+			{
+				OpenCode=OPEN_EDITOR;
+			}
+			else if (Viewer)
+			{
+				OpenCode=OPEN_VIEWER;
+			}
+			else if (Dialog)
+			{
+				OpenCode=OPEN_DIALOG;
+				pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+				Item=(INT_PTR)&pd;
+			}
+
+			HANDLE hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+			if (hPlugin!=INVALID_HANDLE_VALUE && !Editor && !Viewer && !Dialog)
+			{
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+
+			// CtrlObject->Macro.SetMode(PrevMacroMode); -- ���� ���������/�������������� �����������?
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 6767)
+++ plugins.hpp	(working copy)
@@ -230,6 +230,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, const GUID& ItemGuid);
 		Plugin *FindPlugin(const GUID& SysID);
 		INT_PTR PluginGuidToPluginNumber(const GUID& PluginId);
 
Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 6767)
+++ macroopcode.hpp	(working copy)
@@ -224,6 +224,8 @@
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
 

Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 6795)
+++ plugins.hpp	(working copy)
@@ -230,6 +230,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, const GUID& ItemGuid);
 		Plugin *FindPlugin(const GUID& SysID);
 		INT_PTR PluginGuidToPluginNumber(const GUID& PluginId);
 
Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 6795)
+++ macroopcode.hpp	(working copy)
@@ -224,6 +224,8 @@
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
 
Index: macro.cpp
===================================================================
--- macro.cpp	(revision 6795)
+++ macro.cpp	(working copy)
@@ -360,6 +360,8 @@
 static bool xlatFunc(const TMacroFunction*);
 static bool pluginloadFunc(const TMacroFunction*);
 static bool pluginunloadFunc(const TMacroFunction*);
+static bool plugincallFunc(const TMacroFunction*);
+static bool pluginconfigFunc(const TMacroFunction*);
 
 static bool __CheckCondForSkip(DWORD Op);
 
@@ -435,6 +437,8 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,        3, 0},
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,      2, 1},
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,    1, 0},
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid,MenuGuid)",                              plugincallFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,      2, 0},
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          pluginconfigFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,    2, 1},
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,            1, 0},
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,           5, 5},
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,          5, 2},
@@ -4384,7 +4388,68 @@
 	return Ret.i()!=0;
 }
 
+// N=Plugin.Call(Guid,MenuGuid)
+static bool plugincallFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
 
+	if (StrToGuid(Guid.s(),guid) && StrToGuid(MenuGuid.s(),menuGuid) && CtrlObject->Plugins.FindPlugin(guid))
+	{
+		Ret=(__int64)CtrlObject->Plugins.CallPluginItem(guid,menuGuid);
+	}
+
+	VMStack.Push(Ret);
+	return true; //Ret?true:false;
+}
+
+// N=Plugin.Config(Guid[,MenuGuid])
+static bool pluginconfigFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
+	int curType = FrameManager->GetCurrentFrame()->GetType();
+
+	if (curType==MODALTYPE_PANELS && StrToGuid(Guid.s(),guid))
+	{
+		Plugin* pPlugin = CtrlObject->Plugins.FindPlugin(guid);
+		if (pPlugin && pPlugin->HasConfigure())
+		{
+			if (MenuGuid.isUnknown() || !StrToGuid(MenuGuid.s(),menuGuid))
+			{
+				menuGuid = FarGuid;
+				Ret=1;
+			}
+			else
+			{
+				PluginInfo Info = {sizeof(Info)};
+				if (pPlugin->GetPluginInfo(&Info))
+				{
+					for (int i = 0; i < Info.PluginConfig.Count; i++)
+					{
+						if (memcmp(&menuGuid,&(Info.PluginConfig.Guids[i]),sizeof(GUID)) == 0)
+						{
+							Ret=1;
+							break;
+						}
+					}
+				}
+			}
+		
+			if (Ret)
+				CtrlObject->Plugins.ConfigureCurrent(pPlugin,menuGuid);
+		}
+	}
+
+	VMStack.Push(Ret);
+	return true;
+}
+
+
 // V=callplugin(SysID[,param])
 #if 0
 static bool callpluginFunc(const TMacroFunction*)
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 6795)
+++ plugins.cpp	(working copy)
@@ -2243,6 +2243,95 @@
 	return FALSE;
 }
 
+int PluginManager::CallPluginItem(const GUID& Guid, const GUID& ItemGuid)
+{
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->Load() && pPlugin->HasOpenPanel())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			if ((Editor && !(IFlags & PF_EDITOR)) ||
+					(Viewer && !(IFlags & PF_VIEWER)) ||
+					(Dialog && !(IFlags & PF_DIALOG)) ||
+					(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+				return FALSE;
+
+			bool ItemFound = false;
+			for (int i = 0; i < Info.PluginMenu.Count; i++)
+			{
+				if (memcmp(&ItemGuid,&(Info.PluginMenu.Guids[i]),sizeof(GUID)) == 0)
+				{
+					ItemFound = true;
+					break;
+				}
+			}
+			if (!ItemFound)
+				return FALSE;
+				
+			Panel *ActivePanel=CtrlObject->Cp()->ActivePanel;
+			int OpenCode=OPEN_PLUGINSMENU;
+			INT_PTR Item=0;
+			OpenDlgPluginData pd;
+
+			if (Editor)
+			{
+				OpenCode=OPEN_EDITOR;
+			}
+			else if (Viewer)
+			{
+				OpenCode=OPEN_VIEWER;
+			}
+			else if (Dialog)
+			{
+				OpenCode=OPEN_DIALOG;
+				pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+				Item=(INT_PTR)&pd;
+			}
+
+			HANDLE hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+			if (hPlugin!=INVALID_HANDLE_VALUE && !Editor && !Viewer && !Dialog)
+			{
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+
+			// CtrlObject->Macro.SetMode(PrevMacroMode); -- ���� ���������/�������������� �����������?
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;

Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7181)
+++ macro.cpp	(working copy)
@@ -385,7 +385,6 @@
 static bool ascFunc(const TMacroFunction*);
 static bool atoiFunc(const TMacroFunction*);
 static bool beepFunc(const TMacroFunction*);
-static bool callpluginFunc(const TMacroFunction*);
 static bool chrFunc(const TMacroFunction*);
 static bool clipFunc(const TMacroFunction*);
 static bool dateFunc(const TMacroFunction*);
@@ -442,6 +441,10 @@
 static bool xlatFunc(const TMacroFunction*);
 static bool pluginloadFunc(const TMacroFunction*);
 static bool pluginunloadFunc(const TMacroFunction*);
+static bool plugincallFunc(const TMacroFunction*);
+static bool pluginconfigFunc(const TMacroFunction*);
+static bool pluginprefixFunc(const TMacroFunction*);
+static bool plugininternalFunc(const TMacroFunction*);
 
 static TMacroFunction intMacroFunction[]=
 {
@@ -462,7 +465,7 @@
 	{L"BM.BACK",          nullptr, L"N=BM.Back()",                                               usersFunc,          nullptr, 0, 0,                                      MCODE_F_BM_BACK,          0, 0},
 	{L"BM.PUSH",          nullptr, L"N=BM.Push()",                                               usersFunc,          nullptr, 0, 0,                                      MCODE_F_BM_PUSH,          0, 0},
 	{L"BM.STAT",          nullptr, L"N=BM.Stat([N])",                                            usersFunc,          nullptr, 0, 0,                                      MCODE_F_BM_STAT,          1, 1},
-	{L"CALLPLUGIN",       nullptr, L"V=CallPlugin(SysID[,param])",                               callpluginFunc,     nullptr, 0, 0,                                      MCODE_F_CALLPLUGIN,       2, 1},
+	{L"CALLPLUGIN",       nullptr, L"V=CallPlugin(SysID[,param])",                               plugininternalFunc, nullptr, 0, 0,                                      MCODE_F_CALLPLUGIN,       2, 1},
 	{L"CHECKHOTKEY",      nullptr, L"N=CheckHotkey(S[,N])",                                      usersFunc,          nullptr, 0, 0,                                      MCODE_F_MENU_CHECKHOTKEY, 2, 1},
 	{L"CHR",              nullptr, L"S=Chr(N)",                                                  chrFunc,            nullptr, 0, 0,                                      MCODE_F_CHR,              1, 0},
 	{L"CLIP",             nullptr, L"V=Clip(N[,V])",                                             clipFunc,           nullptr, 0, 0,                                      MCODE_F_CLIP,             2, 1},
@@ -516,6 +519,10 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,        3, 0},
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,      2, 1},
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,    1, 0},
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid[,MenuGuid])",                            plugincallFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,      2, 1},
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          pluginconfigFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,    2, 1},
+	{L"PLUGIN.PREFIX",    nullptr, L"N=Plugin.Prefix(Guid,Command)",                             pluginprefixFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_PREFIX,    2, 0},
+	{L"PLUGIN.INT",       nullptr, L"N=Plugin.Int(Guid,Item)",                                   plugininternalFunc, nullptr, 0, 0,                                      MCODE_F_PLUGIN_INT,       2, 0},
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,            1, 0},
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,           5, 5},
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,          5, 2},
@@ -691,10 +698,10 @@
 		}
 		if (0==MacroLIBCount)
 		{
-		xf_free(MacroLIB);
-			MacroLIB=nullptr;
+			xf_free(MacroLIB);
+				MacroLIB=nullptr;
+		}
 	}
-	}
 	else
 	{
 		MacroLIBCount=0;
@@ -4443,7 +4450,65 @@
 	return Ret.i()!=0;
 }
 
+// N=Plugin.Call(Guid[,MenuGuid])
+static bool plugincallFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
+	CallPluginInfo Data={CPT_CALL};
 
+	if (StrToGuid(Guid.s(),guid) && (MenuGuid.isUnknown() || StrToGuid(MenuGuid.s(),menuGuid)))
+	{
+		if (!MenuGuid.isUnknown())
+			Data.ItemGuid=&menuGuid;
+		Ret=(__int64)CtrlObject->Plugins.CallPluginItem(guid,&Data);
+	}
+
+	VMStack.Push(Ret);
+	return true; //Ret?true:false;
+}
+
+// N=Plugin.Config(Guid[,MenuGuid])
+static bool pluginconfigFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar MenuGuid; VMStack.Pop(MenuGuid);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid, menuGuid;
+	CallPluginInfo Data={CPT_CONFIGURE};
+
+	if (StrToGuid(Guid.s(),guid) && (MenuGuid.isUnknown() || StrToGuid(MenuGuid.s(),menuGuid)))
+	{
+		if (!MenuGuid.isUnknown())
+			Data.ItemGuid=&menuGuid;
+		Ret=(__int64)CtrlObject->Plugins.CallPluginItem(guid,&Data);
+	}
+
+	VMStack.Push(Ret);
+	return true;
+}
+
+// N=Plugin.Prefix(Guid,Command)
+static bool pluginprefixFunc(const TMacroFunction*)
+{
+	__int64 Ret=0;
+	TVar Command; VMStack.Pop(Command);
+	TVar Guid; VMStack.Pop(Guid);
+	GUID guid;
+	CallPluginInfo Data={CPT_PREFIX};
+
+	if (StrToGuid(Guid.s(),guid) && Command.isString())
+	{
+		Data.Command=Command.s();
+		Ret=(__int64)CtrlObject->Plugins.CallPluginItem(guid,&Data);
+	}
+
+	VMStack.Push(Ret);
+	return true;
+}
+
 // V=callplugin(SysID[,param])
 #if 0
 static bool callpluginFunc(const TMacroFunction*)
@@ -4554,7 +4619,8 @@
 	return Ret?true:false;
 }
 #else
-static bool callpluginFunc(const TMacroFunction*)
+// N=Plugin.Int(Guid,Item)
+static bool plugininternalFunc(const TMacroFunction*)
 {
 	__int64 Ret=0;
 	TVar Param; VMStack.Pop(Param);
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 7181)
+++ plugins.cpp	(working copy)
@@ -775,11 +775,6 @@
 			break;
 	}
 
-	if(Data)
-	{
-		delete[] Data;
-	}
-
 	if (items.getCount() && (hResult != (HANDLE)-2))
 	{
 		bool OnlyOne = (items.getCount() == 1) && !(Name && Opt.PluginConfirm.OpenFilePlugin && Opt.PluginConfirm.StandardAssociation && Opt.PluginConfirm.EvenIfOnlyOnePlugin);
@@ -836,7 +831,13 @@
 
 		if (pResult && pResult->hPlugin == INVALID_HANDLE_VALUE)
 		{
-			HANDLE h = pResult->pPlugin->Open(OPEN_ANALYSE, FarGuid, 0);
+			AnalyseInfo Info={sizeof(Info)};
+			Info.FileName = Name? Name->CPtr() : nullptr;
+			Info.Buffer = Data;
+			Info.BufferSize = DataSize;
+			Info.OpMode = OpMode|(Type==OFP_ALTERNATIVE?OPM_PGDN:0);
+		
+			HANDLE h = pResult->pPlugin->Open(OPEN_ANALYSE, FarGuid, (INT_PTR)&Info);
 
 			if (h == (HANDLE)-2)
 			{
@@ -854,6 +855,11 @@
 		}
 	}
 
+	if(Data)
+	{
+		delete[] Data;
+	}
+	
 	for (size_t i = 0; i < items.getCount(); i++)
 	{
 		PluginHandle *handle = items.getItem(i);
@@ -2249,6 +2255,196 @@
 	return FALSE;
 }
 
+int PluginManager::CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret/*=nullptr*/)
+{
+	BOOL Result=FALSE;
+
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->Load())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			// ������� �� ���� ������� ���� � ������ ������� (������������� ��������)
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_CONFIGURE:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� �����?
+					//_ASSERTE(curType==MODALTYPE_PANELS);
+					return FALSE;
+				}
+				if (!pPlugin->HasConfigure())
+					return FALSE;
+				break;
+			case CPT_PREFIX:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� �����?
+					//_ASSERTE(curType==MODALTYPE_PANELS);
+					return FALSE;
+				}
+				//TODO: OpenPanel ��� OpenFilePlugin?
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				//TODO: ������ �����
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			}
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			PluginMenuItem *MenuItems=nullptr;
+			GUID ItemGuid;
+
+			// ������� �� ���� ������� ���� � ������ �������
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if ((Editor && !(IFlags & PF_EDITOR)) ||
+						(Viewer && !(IFlags & PF_VIEWER)) ||
+						(Dialog && !(IFlags & PF_DIALOG)) ||
+						(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+					return FALSE;
+				//_ASSERTE(curType==MODALTYPE_PANELS || (Editor&&curType==MODALTYPE_EDITOR) || (Viewer&&curType==MODALTYPE_VIEWER) || (Dialog&&curType==MODALTYPE_DIALOG));
+				MenuItems = &Info.PluginMenu;
+				break;
+			case CPT_CONFIGURE:
+				MenuItems = &Info.PluginConfig;
+				break;
+			case CPT_PREFIX:
+				if (!Info.CommandPrefix || !*Info.CommandPrefix)
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				break;
+			}
+
+			if (Data->CallType==CPT_CALL || Data->CallType==CPT_CONFIGURE)
+			{
+				bool ItemFound = false;
+				if (Data->ItemGuid==nullptr)
+				{
+					if (MenuItems->Count==1)
+					{
+						ItemGuid=MenuItems->Guids[0];
+						ItemFound=true;
+					}
+				}
+				else
+				{
+					for (int i = 0; i < MenuItems->Count; i++)
+					{
+						if (memcmp(Data->ItemGuid, &(MenuItems->Guids[i]), sizeof(GUID)) == 0)
+						{
+							ItemGuid=*Data->ItemGuid;
+							ItemFound=true;
+							break;
+						}
+					}
+				}
+				if (!ItemFound)
+					return FALSE;
+			}
+
+			HANDLE hPlugin=INVALID_HANDLE_VALUE;
+			Panel *ActivePanel=nullptr;
+
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					int OpenCode=OPEN_PLUGINSMENU;
+					INT_PTR Item=0;
+					OpenDlgPluginData pd;
+
+					if (Editor)
+					{
+						OpenCode=OPEN_EDITOR;
+					}
+					else if (Viewer)
+					{
+						OpenCode=OPEN_VIEWER;
+					}
+					else if (Dialog)
+					{
+						OpenCode=OPEN_DIALOG;
+						pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+						Item=(INT_PTR)&pd;
+					}
+
+					hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+					Result=TRUE;
+				}
+				break;
+
+			case CPT_CONFIGURE:
+				CtrlObject->Plugins.ConfigureCurrent(pPlugin,ItemGuid);
+				return TRUE;
+
+			case CPT_PREFIX:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					string command=Data->Command; // ����� ���� ������
+					hPlugin=Open(pPlugin,OPEN_COMMANDLINE,FarGuid,(INT_PTR)command.CPtr());
+
+					Result=TRUE;
+				}
+				break;
+			case CPT_INTERNAL:
+				//TODO: ���� CallPlugin
+				//WARNING: ����, ��� �� ���������� ��� ��������� MacroState
+				break;
+			}
+
+			if (hPlugin!=INVALID_HANDLE_VALUE && !Editor && !Viewer && !Dialog)
+			{
+				//BUGBUG: ������� ������? ����� �� ���?
+				//BUGBUG: � ProcessCommandLine ������ ����� Open, � � CPT_CALL - �����
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 7181)
+++ plugins.hpp	(working copy)
@@ -131,6 +131,26 @@
 	OFP_COMMANDS,
 };
 
+enum CALLPLUGINTYPE
+{
+	CPT_CALL,
+	CPT_CONFIGURE,
+	CPT_PREFIX,
+	CPT_INTERNAL,
+};
+
+struct CallPluginInfo
+{
+	CALLPLUGINTYPE CallType;
+	int OpenFrom;
+	union
+	{
+		GUID *ItemGuid;
+		const wchar_t *Command;
+		__int64 Item;
+	};
+};
+
 struct PluginHandle
 {
 	HANDLE hPlugin;
@@ -230,6 +250,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret=nullptr);
 		Plugin *FindPlugin(const GUID& SysID);
 		INT_PTR PluginGuidToPluginNumber(const GUID& PluginId);
 		static const GUID& GetGUID(HANDLE hPlugin);

Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 7616)
+++ macroopcode.hpp	(working copy)
@@ -224,6 +224,10 @@
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
+	MCODE_F_PLUGIN_PREFIX,            // N=Plugin.Prefix(Guid,Command)
+	MCODE_F_PLUGIN_INT,               // N=Plugin.Int(Guid,Item)
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
 	MCODE_F_DLG_SETFOCUS,             // N=Dlg.SetFocus([ID])
Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7616)
+++ macro.cpp	(working copy)
@@ -390,6 +390,9 @@
 static bool xlatFunc(const TMacroFunction*);
 static bool pluginloadFunc(const TMacroFunction*);
 static bool pluginunloadFunc(const TMacroFunction*);
+static bool plugincallFunc(const TMacroFunction*);
+static bool pluginconfigFunc(const TMacroFunction*);
+static bool pluginprefixFunc(const TMacroFunction*);
 
 static TMacroFunction intMacroFunction[]=
 {
@@ -465,6 +468,10 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,       },
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,     },
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,   },
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid[,MenuGuid])",                            plugincallFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,     },
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          pluginconfigFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,   },
+	{L"PLUGIN.PREFIX",    nullptr, L"N=Plugin.Prefix(Guid,Command)",                             pluginprefixFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_PREFIX,   },
+	{L"PLUGIN.INT",       nullptr, L"N=Plugin.Int(Guid,Item)",                                   usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_INT,      },
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,           },
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,          },
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,         },
@@ -666,10 +673,10 @@
 		}
 		if (0==MacroLIBCount)
 		{
-		xf_free(MacroLIB);
-			MacroLIB=nullptr;
+			xf_free(MacroLIB);
+				MacroLIB=nullptr;
+		}
 	}
-	}
 	else
 	{
 		MacroLIBCount=0;
@@ -4503,7 +4510,65 @@
 	return Ret.i()!=0;
 }
 
+// N=Plugin.Call(Guid[,MenuGuid])
+static bool plugincallFunc(const TMacroFunction*)
+{
+	parseParams(2,Params);
+	TVar Ret(0ll);
+	TVar& MenuGuid = (Params[1]);
+	TVar& Guid = (Params[0]);
+	GUID guid, menuGuid;
+	CallPluginInfo Data={CPT_CALL};
 
+	if (StrToGuid(Guid.s(),guid) && (MenuGuid.isUnknown() || StrToGuid(MenuGuid.s(),menuGuid)))
+	{
+		if (!MenuGuid.isUnknown())
+			Data.ItemGuid=&menuGuid;
+		Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+	}
+
+	return Ret.i()!=0;
+}
+
+// N=Plugin.Config(Guid[,MenuGuid])
+static bool pluginconfigFunc(const TMacroFunction*)
+{
+	parseParams(2,Params);
+	TVar Ret(0ll);
+	TVar& MenuGuid = (Params[1]);
+	TVar& Guid = (Params[0]);
+	GUID guid, menuGuid;
+	CallPluginInfo Data={CPT_CONFIGURE};
+
+	if (StrToGuid(Guid.s(),guid) && (MenuGuid.isUnknown() || StrToGuid(MenuGuid.s(),menuGuid)))
+	{
+		if (!MenuGuid.isUnknown())
+			Data.ItemGuid=&menuGuid;
+		Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+	}
+
+	return Ret.i()!=0;
+}
+
+// N=Plugin.Prefix(Guid,Command)
+static bool pluginprefixFunc(const TMacroFunction*)
+{
+	parseParams(2,Params);
+	TVar Ret(0ll);
+	TVar& Command = (Params[1]);
+	TVar& Guid = (Params[0]);
+	GUID guid;
+	CallPluginInfo Data={CPT_PREFIX};
+
+	if (StrToGuid(Guid.s(),guid) && Command.isString())
+	{
+		Data.Command=Command.s();
+		Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+	}
+
+	return Ret.i()!=0;
+}
+
 static void VarToFarMacroValue(const TVar& From,FarMacroValue& To)
 {
 	To.Type=(FARMACROVARTYPE)From.type();
@@ -5699,6 +5764,8 @@
 		}
 
 		case MCODE_F_CALLPLUGIN: // V=callplugin(SysID[,param])
+		// ����� CallPlugin, �� �������
+		case MCODE_F_PLUGIN_INT: // V=Plugin.Int(SysID[,param])
 		{
 			__int64 Ret=0;
 			int count=VMStack.Pop().getInteger();
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 7616)
+++ plugins.hpp	(working copy)
@@ -129,6 +129,27 @@
 	OFP_COMMANDS,
 };
 
+// �������� ����� ����������� plugin.call � �.�.
+enum CALLPLUGINTYPE
+{
+	CPT_CALL,
+	CPT_CONFIGURE,
+	CPT_PREFIX,
+	CPT_INTERNAL,
+};
+
+struct CallPluginInfo
+{
+	CALLPLUGINTYPE CallType;
+	int OpenFrom;
+	union
+	{
+		GUID *ItemGuid;
+		const wchar_t *Command;
+		__int64 Item;
+	};
+};
+
 struct PluginHandle
 {
 	HANDLE hPlugin;
@@ -232,6 +253,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret=nullptr);
 		Plugin *FindPlugin(const GUID& SysID);
 		static const GUID& GetGUID(HANDLE hPlugin);
 
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 7616)
+++ plugins.cpp	(working copy)
@@ -2474,6 +2474,195 @@
 	return FALSE;
 }
 
+// ��������� ����������� plugin.call, plugin.cmd, plugin.config � �.�
+int PluginManager::CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret/*=nullptr*/)
+{
+	BOOL Result=FALSE;
+
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->Load())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			// ������� �� ���� ������� ���� � ������ ������� (������������� ��������)
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_CONFIGURE:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				if (!pPlugin->HasConfigure())
+					return FALSE;
+				break;
+			case CPT_PREFIX:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				//TODO: OpenPanel ��� OpenFilePlugin?
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				//TODO: ������ �����
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			}
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			PluginMenuItem *MenuItems=nullptr;
+			GUID ItemGuid;
+
+			// ������� �� ���� ������� ���� � ������ �������
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if ((Editor && !(IFlags & PF_EDITOR)) ||
+						(Viewer && !(IFlags & PF_VIEWER)) ||
+						(Dialog && !(IFlags & PF_DIALOG)) ||
+						(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+					return FALSE;
+				//_ASSERTE(curType==MODALTYPE_PANELS || (Editor&&curType==MODALTYPE_EDITOR) || (Viewer&&curType==MODALTYPE_VIEWER) || (Dialog&&curType==MODALTYPE_DIALOG));
+				MenuItems = &Info.PluginMenu;
+				break;
+			case CPT_CONFIGURE:
+				MenuItems = &Info.PluginConfig;
+				break;
+			case CPT_PREFIX:
+				if (!Info.CommandPrefix || !*Info.CommandPrefix)
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				break;
+			}
+
+			if (Data->CallType==CPT_CALL || Data->CallType==CPT_CONFIGURE)
+			{
+				bool ItemFound = false;
+				if (Data->ItemGuid==nullptr)
+				{
+					if (MenuItems->Count==1)
+					{
+						ItemGuid=MenuItems->Guids[0];
+						ItemFound=true;
+					}
+				}
+				else
+				{
+					for (size_t i = 0; i < MenuItems->Count; i++)
+					{
+						if (memcmp(Data->ItemGuid, &(MenuItems->Guids[i]), sizeof(GUID)) == 0)
+						{
+							ItemGuid=*Data->ItemGuid;
+							ItemFound=true;
+							break;
+						}
+					}
+				}
+				if (!ItemFound)
+					return FALSE;
+			}
+
+			HANDLE hPlugin=INVALID_HANDLE_VALUE;
+			Panel *ActivePanel=nullptr;
+
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					int OpenCode=OPEN_PLUGINSMENU;
+					INT_PTR Item=0;
+					OpenDlgPluginData pd;
+
+					if (Editor)
+					{
+						OpenCode=OPEN_EDITOR;
+					}
+					else if (Viewer)
+					{
+						OpenCode=OPEN_VIEWER;
+					}
+					else if (Dialog)
+					{
+						OpenCode=OPEN_DIALOG;
+						pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+						Item=(INT_PTR)&pd;
+					}
+
+					hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+					Result=TRUE;
+				}
+				break;
+
+			case CPT_CONFIGURE:
+				CtrlObject->Plugins->ConfigureCurrent(pPlugin,ItemGuid);
+				return TRUE;
+
+			case CPT_PREFIX:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					string command=Data->Command; // ����� ���� ������
+					hPlugin=Open(pPlugin,OPEN_COMMANDLINE,FarGuid,(INT_PTR)command.CPtr());
+
+					Result=TRUE;
+				}
+				break;
+			case CPT_INTERNAL:
+				//TODO: ���� CallPlugin
+				//WARNING: ����, ��� �� ���������� ��� ��������� MacroState
+				break;
+			}
+
+			if (hPlugin!=INVALID_HANDLE_VALUE && !Editor && !Viewer && !Dialog)
+			{
+				//BUGBUG: ������� ������? ����� �� ���?
+				//BUGBUG: � ProcessCommandLine ������ ����� Open, � � CPT_CALL - �����
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;

Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 7616)
+++ macroopcode.hpp	(working copy)
@@ -224,6 +224,10 @@
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
+	MCODE_F_PLUGIN_PREFIX,            // N=Plugin.Prefix(Guid,Command)
+	MCODE_F_PLUGIN_INT,               // N=Plugin.Int(Guid,Item)
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
 	MCODE_F_DLG_SETFOCUS,             // N=Dlg.SetFocus([ID])
Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7616)
+++ macro.cpp	(working copy)
@@ -390,6 +390,9 @@
 static bool xlatFunc(const TMacroFunction*);
 static bool pluginloadFunc(const TMacroFunction*);
 static bool pluginunloadFunc(const TMacroFunction*);
+static bool plugincallFunc(const TMacroFunction*);
+static bool pluginconfigFunc(const TMacroFunction*);
+static bool pluginprefixFunc(const TMacroFunction*);
 
 static TMacroFunction intMacroFunction[]=
 {
@@ -465,6 +468,10 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,       },
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,     },
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,   },
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid[,MenuGuid])",                            plugincallFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,     },
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          pluginconfigFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,   },
+	{L"PLUGIN.PREFIX",    nullptr, L"N=Plugin.Prefix(Guid,Command)",                             pluginprefixFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_PREFIX,   },
+	{L"PLUGIN.INT",       nullptr, L"N=Plugin.Int(Guid,Item)",                                   usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_INT,      },
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,           },
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,          },
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,         },
@@ -666,10 +673,10 @@
 		}
 		if (0==MacroLIBCount)
 		{
-		xf_free(MacroLIB);
-			MacroLIB=nullptr;
+			xf_free(MacroLIB);
+				MacroLIB=nullptr;
+		}
 	}
-	}
 	else
 	{
 		MacroLIBCount=0;
@@ -4503,7 +4510,65 @@
 	return Ret.i()!=0;
 }
 
+// N=Plugin.Call(Guid[,MenuGuid])
+static bool plugincallFunc(const TMacroFunction*)
+{
+	parseParams(2,Params);
+	TVar Ret(0ll);
+	TVar& MenuGuid = (Params[1]);
+	TVar& Guid = (Params[0]);
+	GUID guid, menuGuid;
+	CallPluginInfo Data={CPT_CALL};
 
+	if (StrToGuid(Guid.s(),guid) && (MenuGuid.isUnknown() || StrToGuid(MenuGuid.s(),menuGuid)))
+	{
+		if (!MenuGuid.isUnknown())
+			Data.ItemGuid=&menuGuid;
+		Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+	}
+
+	return Ret.i()!=0;
+}
+
+// N=Plugin.Config(Guid[,MenuGuid])
+static bool pluginconfigFunc(const TMacroFunction*)
+{
+	parseParams(2,Params);
+	TVar Ret(0ll);
+	TVar& MenuGuid = (Params[1]);
+	TVar& Guid = (Params[0]);
+	GUID guid, menuGuid;
+	CallPluginInfo Data={CPT_CONFIGURE};
+
+	if (StrToGuid(Guid.s(),guid) && (MenuGuid.isUnknown() || StrToGuid(MenuGuid.s(),menuGuid)))
+	{
+		if (!MenuGuid.isUnknown())
+			Data.ItemGuid=&menuGuid;
+		Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+	}
+
+	return Ret.i()!=0;
+}
+
+// N=Plugin.Prefix(Guid,Command)
+static bool pluginprefixFunc(const TMacroFunction*)
+{
+	parseParams(2,Params);
+	TVar Ret(0ll);
+	TVar& Command = (Params[1]);
+	TVar& Guid = (Params[0]);
+	GUID guid;
+	CallPluginInfo Data={CPT_PREFIX};
+
+	if (StrToGuid(Guid.s(),guid) && Command.isString())
+	{
+		Data.Command=Command.s();
+		Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+	}
+
+	return Ret.i()!=0;
+}
+
 static void VarToFarMacroValue(const TVar& From,FarMacroValue& To)
 {
 	To.Type=(FARMACROVARTYPE)From.type();
@@ -5699,6 +5764,8 @@
 		}
 
 		case MCODE_F_CALLPLUGIN: // V=callplugin(SysID[,param])
+		// ����� CallPlugin, �� �������
+		case MCODE_F_PLUGIN_INT: // V=Plugin.Int(SysID[,param])
 		{
 			__int64 Ret=0;
 			int count=VMStack.Pop().getInteger();
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 7616)
+++ plugins.hpp	(working copy)
@@ -129,6 +129,27 @@
 	OFP_COMMANDS,
 };
 
+// �������� ����� ����������� plugin.call � �.�.
+enum CALLPLUGINTYPE
+{
+	CPT_CALL,
+	CPT_CONFIGURE,
+	CPT_PREFIX,
+	CPT_INTERNAL,
+};
+
+struct CallPluginInfo
+{
+	CALLPLUGINTYPE CallType;
+	int OpenFrom;
+	union
+	{
+		GUID *ItemGuid;
+		const wchar_t *Command;
+		__int64 Item;
+	};
+};
+
 struct PluginHandle
 {
 	HANDLE hPlugin;
@@ -232,6 +253,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret=nullptr);
 		Plugin *FindPlugin(const GUID& SysID);
 		static const GUID& GetGUID(HANDLE hPlugin);
 
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 7616)
+++ plugins.cpp	(working copy)
@@ -2474,6 +2474,195 @@
 	return FALSE;
 }
 
+// ��������� ����������� plugin.call, plugin.cmd, plugin.config � �.�
+int PluginManager::CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret/*=nullptr*/)
+{
+	BOOL Result=FALSE;
+
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->Load())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			// ������� �� ���� ������� ���� � ������ ������� (������������� ��������)
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_CONFIGURE:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				if (!pPlugin->HasConfigure())
+					return FALSE;
+				break;
+			case CPT_PREFIX:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				//TODO: OpenPanel ��� OpenFilePlugin?
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				//TODO: ������ �����
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			}
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			PluginMenuItem *MenuItems=nullptr;
+			GUID ItemGuid;
+
+			// ������� �� ���� ������� ���� � ������ �������
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if ((Editor && !(IFlags & PF_EDITOR)) ||
+						(Viewer && !(IFlags & PF_VIEWER)) ||
+						(Dialog && !(IFlags & PF_DIALOG)) ||
+						(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+					return FALSE;
+				//_ASSERTE(curType==MODALTYPE_PANELS || (Editor&&curType==MODALTYPE_EDITOR) || (Viewer&&curType==MODALTYPE_VIEWER) || (Dialog&&curType==MODALTYPE_DIALOG));
+				MenuItems = &Info.PluginMenu;
+				break;
+			case CPT_CONFIGURE:
+				MenuItems = &Info.PluginConfig;
+				break;
+			case CPT_PREFIX:
+				if (!Info.CommandPrefix || !*Info.CommandPrefix)
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				break;
+			}
+
+			if (Data->CallType==CPT_CALL || Data->CallType==CPT_CONFIGURE)
+			{
+				bool ItemFound = false;
+				if (Data->ItemGuid==nullptr)
+				{
+					if (MenuItems->Count==1)
+					{
+						ItemGuid=MenuItems->Guids[0];
+						ItemFound=true;
+					}
+				}
+				else
+				{
+					for (size_t i = 0; i < MenuItems->Count; i++)
+					{
+						if (memcmp(Data->ItemGuid, &(MenuItems->Guids[i]), sizeof(GUID)) == 0)
+						{
+							ItemGuid=*Data->ItemGuid;
+							ItemFound=true;
+							break;
+						}
+					}
+				}
+				if (!ItemFound)
+					return FALSE;
+			}
+
+			HANDLE hPlugin=INVALID_HANDLE_VALUE;
+			Panel *ActivePanel=nullptr;
+
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					int OpenCode=OPEN_PLUGINSMENU;
+					INT_PTR Item=0;
+					OpenDlgPluginData pd;
+
+					if (Editor)
+					{
+						OpenCode=OPEN_EDITOR;
+					}
+					else if (Viewer)
+					{
+						OpenCode=OPEN_VIEWER;
+					}
+					else if (Dialog)
+					{
+						OpenCode=OPEN_DIALOG;
+						pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+						Item=(INT_PTR)&pd;
+					}
+
+					hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+					Result=TRUE;
+				}
+				break;
+
+			case CPT_CONFIGURE:
+				CtrlObject->Plugins->ConfigureCurrent(pPlugin,ItemGuid);
+				return TRUE;
+
+			case CPT_PREFIX:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					string command=Data->Command; // ����� ���� ������
+					hPlugin=Open(pPlugin,OPEN_COMMANDLINE,FarGuid,(INT_PTR)command.CPtr());
+
+					Result=TRUE;
+				}
+				break;
+			case CPT_INTERNAL:
+				//TODO: ���� CallPlugin
+				//WARNING: ����, ��� �� ���������� ��� ��������� MacroState
+				break;
+			}
+
+			if (hPlugin && !Editor && !Viewer && !Dialog)
+			{
+				//BUGBUG: ������� ������? ����� �� ���?
+				//BUGBUG: � ProcessCommandLine ������ ����� Open, � � CPT_CALL - �����
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;

Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7650)
+++ macro.cpp	(working copy)
@@ -465,6 +465,10 @@
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,       },
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,     },
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,   },
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid[,MenuGuid])",                            usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,     },
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,   },
+	{L"PLUGIN.PREFIX",    nullptr, L"N=Plugin.Prefix(Guid,Command)",                             usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_PREFIX,   },
+	{L"PLUGIN.INT",       nullptr, L"N=Plugin.Int(Guid,Item)",                                   usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_INT,      },
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,           },
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,          },
 	{L"REPLACE",          nullptr, L"S=Replace(Str,Find,Replace[,Cnt[,Mode]])",                  replaceFunc,        nullptr, 0, 0,                                      MCODE_F_REPLACE,         },
@@ -666,10 +670,10 @@
 		}
 		if (0==MacroLIBCount)
 		{
-		xf_free(MacroLIB);
-			MacroLIB=nullptr;
+			xf_free(MacroLIB);
+				MacroLIB=nullptr;
+		}
 	}
-	}
 	else
 	{
 		MacroLIBCount=0;
@@ -4504,6 +4508,7 @@
 }
 
 
+
 static void VarToFarMacroValue(const TVar& From,FarMacroValue& To)
 {
 	To.Type=(FARMACROVARTYPE)From.type();
@@ -5699,6 +5704,8 @@
 		}
 
 		case MCODE_F_CALLPLUGIN: // V=callplugin(SysID[,param])
+		// ����� CallPlugin, �� �������
+		case MCODE_F_PLUGIN_INT: // V=Plugin.Int(SysID[,param])
 		{
 			__int64 Ret=0;
 			int count=VMStack.Pop().getInteger();
@@ -5759,6 +5766,66 @@
 			goto begin;
 		}
 
+		case MCODE_F_PLUGIN_CALL:   // N=Plugin.Call(Guid[,MenuGuid])
+		case MCODE_F_PLUGIN_CONFIG: // N=Plugin.Config(Guid[,MenuGuid])
+		case MCODE_F_PLUGIN_PREFIX: // N=Plugin.Prefix(Guid,Command)
+		{
+			__int64 Ret=0;
+			parseParams(2,Params);
+			TVar& Arg = (Params[1]);
+			TVar& Guid = (Params[0]);
+			GUID guid, menuGuid;
+			CallPluginInfo Data={};
+			wchar_t EmptyStr[1] = {};
+
+
+			switch (Key)
+			{
+			case MCODE_F_PLUGIN_CALL:
+				Data.CallType = CPT_CALL;
+				if (StrToGuid(Arg.s(),menuGuid))
+					Data.ItemGuid=&menuGuid;
+				break;
+			case MCODE_F_PLUGIN_CONFIG:
+				Data.CallType = CPT_CONFIGURE;
+				if (StrToGuid(Arg.s(),menuGuid))
+					Data.ItemGuid=&menuGuid;
+				break;
+			case MCODE_F_PLUGIN_PREFIX:
+				Data.CallType = CPT_PREFIX;
+				if (Arg.isString())
+					Data.Command=Arg.s();
+				else
+					Data.Command=EmptyStr;
+				break;
+            }
+
+			if (StrToGuid(Guid.s(),guid) && CtrlObject->Plugins->FindPlugin(guid))
+			{
+				int CallPluginRules=1; //GetCurrentCallPluginMode();
+
+				if( CallPluginRules == 1)
+					PushState(true);
+				else
+					InternalInput++;
+
+				int ResultCallPlugin=0;
+
+				Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+
+				if( CallPluginRules == 1 )
+					PopState();
+				else
+					InternalInput--;
+			}
+
+			if (Work.Executing == MACROMODE_NOMACRO)
+				goto return_func;
+
+			VMStack.Push(Ret);
+			goto begin;
+		}
+
 		default:
 		{
 			size_t J;
Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 7650)
+++ macroopcode.hpp	(working copy)
@@ -224,6 +224,10 @@
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
+	MCODE_F_PLUGIN_PREFIX,            // N=Plugin.Prefix(Guid,Command)
+	MCODE_F_PLUGIN_INT,               // N=Plugin.Int(Guid,Item)
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
 	MCODE_F_DLG_SETFOCUS,             // N=Dlg.SetFocus([ID])
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 7650)
+++ plugins.cpp	(working copy)
@@ -2474,6 +2474,195 @@
 	return FALSE;
 }
 
+// ��������� ����������� plugin.call, plugin.cmd, plugin.config � �.�
+int PluginManager::CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret/*=nullptr*/)
+{
+	BOOL Result=FALSE;
+
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->Load())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			// ������� �� ���� ������� ���� � ������ ������� (������������� ��������)
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_CONFIGURE:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				if (!pPlugin->HasConfigure())
+					return FALSE;
+				break;
+			case CPT_PREFIX:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				//TODO: OpenPanel ��� OpenFilePlugin?
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				//TODO: ������ �����
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			}
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			PluginMenuItem *MenuItems=nullptr;
+			GUID ItemGuid;
+
+			// ������� �� ���� ������� ���� � ������ �������
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if ((Editor && !(IFlags & PF_EDITOR)) ||
+						(Viewer && !(IFlags & PF_VIEWER)) ||
+						(Dialog && !(IFlags & PF_DIALOG)) ||
+						(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+					return FALSE;
+				//_ASSERTE(curType==MODALTYPE_PANELS || (Editor&&curType==MODALTYPE_EDITOR) || (Viewer&&curType==MODALTYPE_VIEWER) || (Dialog&&curType==MODALTYPE_DIALOG));
+				MenuItems = &Info.PluginMenu;
+				break;
+			case CPT_CONFIGURE:
+				MenuItems = &Info.PluginConfig;
+				break;
+			case CPT_PREFIX:
+				if (!Info.CommandPrefix || !*Info.CommandPrefix)
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				break;
+			}
+
+			if (Data->CallType==CPT_CALL || Data->CallType==CPT_CONFIGURE)
+			{
+				bool ItemFound = false;
+				if (Data->ItemGuid==nullptr)
+				{
+					if (MenuItems->Count==1)
+					{
+						ItemGuid=MenuItems->Guids[0];
+						ItemFound=true;
+					}
+				}
+				else
+				{
+					for (size_t i = 0; i < MenuItems->Count; i++)
+					{
+						if (memcmp(Data->ItemGuid, &(MenuItems->Guids[i]), sizeof(GUID)) == 0)
+						{
+							ItemGuid=*Data->ItemGuid;
+							ItemFound=true;
+							break;
+						}
+					}
+				}
+				if (!ItemFound)
+					return FALSE;
+			}
+
+			HANDLE hPlugin=INVALID_HANDLE_VALUE;
+			Panel *ActivePanel=nullptr;
+
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					int OpenCode=OPEN_PLUGINSMENU;
+					INT_PTR Item=0;
+					OpenDlgPluginData pd;
+
+					if (Editor)
+					{
+						OpenCode=OPEN_EDITOR;
+					}
+					else if (Viewer)
+					{
+						OpenCode=OPEN_VIEWER;
+					}
+					else if (Dialog)
+					{
+						OpenCode=OPEN_DIALOG;
+						pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+						Item=(INT_PTR)&pd;
+					}
+
+					hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+					Result=TRUE;
+				}
+				break;
+
+			case CPT_CONFIGURE:
+				CtrlObject->Plugins->ConfigureCurrent(pPlugin,ItemGuid);
+				return TRUE;
+
+			case CPT_PREFIX:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					string command=Data->Command; // ����� ���� ������
+					hPlugin=Open(pPlugin,OPEN_COMMANDLINE,FarGuid,(INT_PTR)command.CPtr());
+
+					Result=TRUE;
+				}
+				break;
+			case CPT_INTERNAL:
+				//TODO: ���� CallPlugin
+				//WARNING: ����, ��� �� ���������� ��� ��������� MacroState
+				break;
+			}
+
+			if (hPlugin!=INVALID_HANDLE_VALUE && !Editor && !Viewer && !Dialog)
+			{
+				//BUGBUG: ������� ������? ����� �� ���?
+				//BUGBUG: � ProcessCommandLine ������ ����� Open, � � CPT_CALL - �����
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 7650)
+++ plugins.hpp	(working copy)
@@ -129,6 +129,27 @@
 	OFP_COMMANDS,
 };
 
+// �������� ����� ����������� plugin.call � �.�.
+enum CALLPLUGINTYPE
+{
+	CPT_CALL,
+	CPT_CONFIGURE,
+	CPT_PREFIX,
+	CPT_INTERNAL,
+};
+
+struct CallPluginInfo
+{
+	CALLPLUGINTYPE CallType;
+	int OpenFrom;
+	union
+	{
+		GUID *ItemGuid;
+		const wchar_t *Command;
+		__int64 Item;
+	};
+};
+
 struct PluginHandle
 {
 	HANDLE hPlugin;
@@ -232,6 +253,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret=nullptr);
 		Plugin *FindPlugin(const GUID& SysID);
 		static const GUID& GetGUID(HANDLE hPlugin);
 

Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7669)
+++ macro.cpp	(working copy)
@@ -463,7 +463,11 @@
 	{L"PANEL.SETPOS",     nullptr, L"N=panel.SetPos(panelType,fileName)",                        panelsetposFunc,    nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PANEL_SETPOS,    },
 	{L"PANEL.SETPOSIDX",  nullptr, L"N=Panel.SetPosIdx(panelType,Idx[,InSelection])",            panelsetposidxFunc, nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PANEL_SETPOSIDX, },
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,       },
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid[,MenuGuid])",                            usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,     },
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,   },
+	{L"PLUGIN.INT",       nullptr, L"N=Plugin.Int(Guid,Item)",                                   usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_INT,      },
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,     },
+	{L"PLUGIN.PREFIX",    nullptr, L"N=Plugin.Prefix(Guid,Command)",                             usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_PREFIX,   },
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,   },
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,           },
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,          },
@@ -666,10 +670,10 @@
 		}
 		if (0==MacroLIBCount)
 		{
-		xf_free(MacroLIB);
-			MacroLIB=nullptr;
+			xf_free(MacroLIB);
+				MacroLIB=nullptr;
+		}
 	}
-	}
 	else
 	{
 		MacroLIBCount=0;
@@ -4504,6 +4508,7 @@
 }
 
 
+
 static void VarToFarMacroValue(const TVar& From,FarMacroValue& To)
 {
 	To.Type=(FARMACROVARTYPE)From.type();
@@ -5699,6 +5704,8 @@
 		}
 
 		case MCODE_F_CALLPLUGIN: // V=callplugin(SysID[,param])
+		// ����� CallPlugin, �� �������
+		case MCODE_F_PLUGIN_INT: // V=Plugin.Int(SysID[,param])
 		{
 			__int64 Ret=0;
 			int count=VMStack.Pop().getInteger();
@@ -5759,6 +5766,66 @@
 			goto begin;
 		}
 
+		case MCODE_F_PLUGIN_CALL:   // N=Plugin.Call(Guid[,MenuGuid])
+		case MCODE_F_PLUGIN_CONFIG: // N=Plugin.Config(Guid[,MenuGuid])
+		case MCODE_F_PLUGIN_PREFIX: // N=Plugin.Prefix(Guid,Command)
+		{
+			__int64 Ret=0;
+			parseParams(2,Params);
+			TVar& Arg = (Params[1]);
+			TVar& Guid = (Params[0]);
+			GUID guid, menuGuid;
+			CallPluginInfo Data={};
+			wchar_t EmptyStr[1] = {};
+
+
+			switch (Key)
+			{
+			case MCODE_F_PLUGIN_CALL:
+				Data.CallType = CPT_CALL;
+				if (StrToGuid(Arg.s(),menuGuid))
+					Data.ItemGuid=&menuGuid;
+				break;
+			case MCODE_F_PLUGIN_CONFIG:
+				Data.CallType = CPT_CONFIGURE;
+				if (StrToGuid(Arg.s(),menuGuid))
+					Data.ItemGuid=&menuGuid;
+				break;
+			case MCODE_F_PLUGIN_PREFIX:
+				Data.CallType = CPT_PREFIX;
+				if (Arg.isString())
+					Data.Command=Arg.s();
+				else
+					Data.Command=EmptyStr;
+				break;
+            }
+
+			if (StrToGuid(Guid.s(),guid) && CtrlObject->Plugins->FindPlugin(guid))
+			{
+				int CallPluginRules=1; //GetCurrentCallPluginMode();
+
+				if( CallPluginRules == 1)
+					PushState(true);
+				else
+					InternalInput++;
+
+				int ResultCallPlugin=0;
+
+				Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+
+				if( CallPluginRules == 1 )
+					PopState();
+				else
+					InternalInput--;
+			}
+
+			if (Work.Executing == MACROMODE_NOMACRO)
+				goto return_func;
+
+			VMStack.Push(Ret);
+			goto begin;
+		}
+
 		default:
 		{
 			size_t J;
Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 7669)
+++ macroopcode.hpp	(working copy)
@@ -222,7 +222,11 @@
 	MCODE_F_KEYBAR_SHOW,              // N=KeyBar.Show([N])
 	MCODE_F_HISTIORY_DISABLE,         // N=History.Disable([State])
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
+	MCODE_F_PLUGIN_INT,               // N=Plugin.Int(Guid,Item)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
+	MCODE_F_PLUGIN_PREFIX,            // N=Plugin.Prefix(Guid,Command)
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 7650)
+++ plugins.cpp	(working copy)
@@ -2474,6 +2474,195 @@
 	return FALSE;
 }
 
+// ��������� ����������� plugin.call, plugin.cmd, plugin.config � �.�
+int PluginManager::CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret/*=nullptr*/)
+{
+	BOOL Result=FALSE;
+
+	if (!ProcessException)
+	{
+		Plugin *pPlugin = FindPlugin(Guid);
+		if (pPlugin && pPlugin->Load())
+		{
+			int curType = FrameManager->GetCurrentFrame()->GetType();
+			bool Editor = curType==MODALTYPE_EDITOR;
+			bool Viewer = curType==MODALTYPE_VIEWER;
+			bool Dialog = curType==MODALTYPE_DIALOG;
+
+			// ������� �� ���� ������� ���� � ������ ������� (������������� ��������)
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_CONFIGURE:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				if (!pPlugin->HasConfigure())
+					return FALSE;
+				break;
+			case CPT_PREFIX:
+				if (curType!=MODALTYPE_PANELS)
+				{
+					//TODO: ����������� �� curType �� �����?
+					return FALSE;
+				}
+				//TODO: OpenPanel ��� OpenFilePlugin?
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				//TODO: ������ �����
+				if (!pPlugin->HasOpenPanel())
+					return FALSE;
+				break;
+			}
+
+			UINT64 IFlags;
+			PluginInfo Info = {sizeof(Info)};
+			if (!pPlugin->GetPluginInfo(&Info))
+				return FALSE;
+			else
+				IFlags = Info.Flags;
+
+			PluginMenuItem *MenuItems=nullptr;
+			GUID ItemGuid;
+
+			// ������� �� ���� ������� ���� � ������ �������
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				if ((Editor && !(IFlags & PF_EDITOR)) ||
+						(Viewer && !(IFlags & PF_VIEWER)) ||
+						(Dialog && !(IFlags & PF_DIALOG)) ||
+						(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+					return FALSE;
+				//_ASSERTE(curType==MODALTYPE_PANELS || (Editor&&curType==MODALTYPE_EDITOR) || (Viewer&&curType==MODALTYPE_VIEWER) || (Dialog&&curType==MODALTYPE_DIALOG));
+				MenuItems = &Info.PluginMenu;
+				break;
+			case CPT_CONFIGURE:
+				MenuItems = &Info.PluginConfig;
+				break;
+			case CPT_PREFIX:
+				if (!Info.CommandPrefix || !*Info.CommandPrefix)
+					return FALSE;
+				break;
+			case CPT_INTERNAL:
+				break;
+			}
+
+			if (Data->CallType==CPT_CALL || Data->CallType==CPT_CONFIGURE)
+			{
+				bool ItemFound = false;
+				if (Data->ItemGuid==nullptr)
+				{
+					if (MenuItems->Count==1)
+					{
+						ItemGuid=MenuItems->Guids[0];
+						ItemFound=true;
+					}
+				}
+				else
+				{
+					for (size_t i = 0; i < MenuItems->Count; i++)
+					{
+						if (memcmp(Data->ItemGuid, &(MenuItems->Guids[i]), sizeof(GUID)) == 0)
+						{
+							ItemGuid=*Data->ItemGuid;
+							ItemFound=true;
+							break;
+						}
+					}
+				}
+				if (!ItemFound)
+					return FALSE;
+			}
+
+			HANDLE hPlugin=INVALID_HANDLE_VALUE;
+			Panel *ActivePanel=nullptr;
+
+			switch (Data->CallType)
+			{
+			case CPT_CALL:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					int OpenCode=OPEN_PLUGINSMENU;
+					INT_PTR Item=0;
+					OpenDlgPluginData pd;
+
+					if (Editor)
+					{
+						OpenCode=OPEN_EDITOR;
+					}
+					else if (Viewer)
+					{
+						OpenCode=OPEN_VIEWER;
+					}
+					else if (Dialog)
+					{
+						OpenCode=OPEN_DIALOG;
+						pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+						Item=(INT_PTR)&pd;
+					}
+
+					hPlugin=Open(pPlugin,OpenCode,ItemGuid,Item);
+
+					Result=TRUE;
+				}
+				break;
+
+			case CPT_CONFIGURE:
+				CtrlObject->Plugins->ConfigureCurrent(pPlugin,ItemGuid);
+				return TRUE;
+
+			case CPT_PREFIX:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					string command=Data->Command; // ����� ���� ������
+					hPlugin=Open(pPlugin,OPEN_COMMANDLINE,FarGuid,(INT_PTR)command.CPtr());
+
+					Result=TRUE;
+				}
+				break;
+			case CPT_INTERNAL:
+				//TODO: ���� CallPlugin
+				//WARNING: ����, ��� �� ���������� ��� ��������� MacroState
+				break;
+			}
+
+			if (hPlugin && !Editor && !Viewer && !Dialog)
+			{
+				//BUGBUG: ������� ������? ����� �� ���?
+				//BUGBUG: � ProcessCommandLine ������ ����� Open, � � CPT_CALL - �����
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+		}
+	}
+
+	return FALSE;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 7650)
+++ plugins.hpp	(working copy)
@@ -129,6 +129,27 @@
 	OFP_COMMANDS,
 };
 
+// �������� ����� ����������� plugin.call � �.�.
+enum CALLPLUGINTYPE
+{
+	CPT_CALL,
+	CPT_CONFIGURE,
+	CPT_PREFIX,
+	CPT_INTERNAL,
+};
+
+struct CallPluginInfo
+{
+	CALLPLUGINTYPE CallType;
+	int OpenFrom;
+	union
+	{
+		GUID *ItemGuid;
+		const wchar_t *Command;
+		__int64 Item;
+	};
+};
+
 struct PluginHandle
 {
 	HANDLE hPlugin;
@@ -232,6 +253,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret=nullptr);
 		Plugin *FindPlugin(const GUID& SysID);
 		static const GUID& GetGUID(HANDLE hPlugin);
 

Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7682)
+++ macro.cpp	(working copy)
@@ -463,7 +463,11 @@
 	{L"PANEL.SETPOS",     nullptr, L"N=panel.SetPos(panelType,fileName)",                        panelsetposFunc,    nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PANEL_SETPOS,    },
 	{L"PANEL.SETPOSIDX",  nullptr, L"N=Panel.SetPosIdx(panelType,Idx[,InSelection])",            panelsetposidxFunc, nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PANEL_SETPOSIDX, },
 	{L"PANELITEM",        nullptr, L"V=PanelItem(Panel,Index,TypeInfo)",                         panelitemFunc,      nullptr, 0, 0,                                      MCODE_F_PANELITEM,       },
+	{L"PLUGIN.CALL",      nullptr, L"N=Plugin.Call(Guid[,MenuGuid])",                            usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_CALL,     },
+	{L"PLUGIN.CONFIG",    nullptr, L"N=Plugin.Config(Guid[,MenuGuid])",                          usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_CONFIG,   },
+	{L"PLUGIN.INT",       nullptr, L"N=Plugin.Int(Guid,Item)",                                   usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_INT,      },
 	{L"PLUGIN.LOAD",      nullptr, L"N=Plugin.Load(DllPath[,ForceLoad])",                        pluginloadFunc,     nullptr, 0, 0,                                      MCODE_F_PLUGIN_LOAD,     },
+	{L"PLUGIN.PREFIX",    nullptr, L"N=Plugin.Prefix(Guid,Command)",                             usersFunc,          nullptr, 0, 0,                                      MCODE_F_PLUGIN_PREFIX,   },
 	{L"PLUGIN.UNLOAD",    nullptr, L"N=Plugin.UnLoad(DllPath)",                                  pluginunloadFunc,   nullptr, 0, 0,                                      MCODE_F_PLUGIN_UNLOAD,   },
 	{L"PRINT",            nullptr, L"N=Print(Str)",                                              usersFunc,          nullptr, 0, 0,                                      MCODE_F_PRINT,           },
 	{L"PROMPT",           nullptr, L"S=Prompt([Title[,Prompt[,flags[,Src[,History]]]]])",        promptFunc,         nullptr, 0, IMFF_UNLOCKSCREEN|IMFF_DISABLEINTINPUT, MCODE_F_PROMPT,          },
@@ -666,10 +670,10 @@
 		}
 		if (0==MacroLIBCount)
 		{
-		xf_free(MacroLIB);
-			MacroLIB=nullptr;
+			xf_free(MacroLIB);
+				MacroLIB=nullptr;
+		}
 	}
-	}
 	else
 	{
 		MacroLIBCount=0;
@@ -4504,6 +4508,7 @@
 }
 
 
+
 static void VarToFarMacroValue(const TVar& From,FarMacroValue& To)
 {
 	To.Type=(FARMACROVARTYPE)From.type();
@@ -5699,6 +5704,8 @@
 		}
 
 		case MCODE_F_CALLPLUGIN: // V=callplugin(SysID[,param])
+		// ����� CallPlugin, �� �������
+		case MCODE_F_PLUGIN_INT: // V=Plugin.Int(SysID[,param])
 		{
 			__int64 Ret=0;
 			int count=VMStack.Pop().getInteger();
@@ -5759,6 +5766,100 @@
 			goto begin;
 		}
 
+		case MCODE_F_PLUGIN_CALL:   // N=Plugin.Call(Guid[,MenuGuid])
+		case MCODE_F_PLUGIN_CONFIG: // N=Plugin.Config(Guid[,MenuGuid])
+		case MCODE_F_PLUGIN_PREFIX: // N=Plugin.Prefix(Guid,Command)
+		{
+			__int64 Ret=0;
+			parseParams(2,Params);
+			TVar& Arg = (Params[1]);
+			TVar& Guid = (Params[0]);
+			GUID guid, menuGuid;
+			CallPluginInfo Data={CPT_CHECKONLY};
+			wchar_t EmptyStr[1]={};
+			bool ItemFailed=false;
+
+
+			switch (Key)
+			{
+			case MCODE_F_PLUGIN_CALL:
+				Data.CallFlags |= CPT_CALL;
+				if (!Arg.isUnknown())
+				{
+					if (StrToGuid(Arg.s(),menuGuid))
+						Data.ItemGuid=&menuGuid;
+					else
+						ItemFailed=true;
+				}
+				break;
+			case MCODE_F_PLUGIN_CONFIG:
+				Data.CallFlags |= CPT_CONFIGURE;
+				if (!Arg.isUnknown())
+				{
+					if (StrToGuid(Arg.s(),menuGuid))
+						Data.ItemGuid=&menuGuid;
+					else
+						ItemFailed=true;
+				}
+				break;
+			case MCODE_F_PLUGIN_PREFIX:
+				Data.CallFlags |= CPT_PREFIX;
+				if (Arg.isString())
+					Data.Command=Arg.s();
+				else
+					Data.Command=EmptyStr;
+				break;
+            }
+
+			if (!ItemFailed && StrToGuid(Guid.s(),guid) && CtrlObject->Plugins->FindPlugin(guid))
+			{
+				int CallPluginRules=1; //GetCurrentCallPluginMode();
+
+				if( CallPluginRules == 1)
+				{
+					PushState(true);
+				}
+				else
+				{
+					InternalInput++;
+				}
+
+				int ResultCallPlugin=0;
+
+				// ���� ������ �������� "��������" ����� �������� ������ �������/������
+				Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+				VMStack.Push(Ret);
+
+				if (Ret)
+				{
+					// ���� ���� ������ - �� ����� ���������
+					Data.CallFlags&=~CPT_CHECKONLY;
+					Ret=(__int64)CtrlObject->Plugins->CallPluginItem(guid,&Data);
+				}
+
+				if( CallPluginRules == 1 )
+				{
+					PopState();
+				}
+				else
+				{
+					InternalInput--;
+				}
+			}
+			else
+			{
+				VMStack.Push(Ret);
+			}
+
+			// �� �������� � KEY_F11
+			FrameManager->RefreshFrame();
+
+			if (Work.Executing == MACROMODE_NOMACRO)
+				goto return_func;
+
+			goto begin;
+		}
+
 		default:
 		{
 			size_t J;
Index: macroopcode.hpp
===================================================================
--- macroopcode.hpp	(revision 7682)
+++ macroopcode.hpp	(working copy)
@@ -222,7 +222,11 @@
 	MCODE_F_KEYBAR_SHOW,              // N=KeyBar.Show([N])
 	MCODE_F_HISTIORY_DISABLE,         // N=History.Disable([State])
 	MCODE_F_FMATCH,                   // N=FMatch(S,Mask)
+	MCODE_F_PLUGIN_CALL,              // N=Plugin.Call(Guid,MenuGuid)
+	MCODE_F_PLUGIN_CONFIG,            // N=Plugin.Config(Guid[,MenuGuid])
+	MCODE_F_PLUGIN_INT,               // N=Plugin.Int(Guid,Item)
 	MCODE_F_PLUGIN_LOAD,              // N=Plugin.Load(DllPath[,ForceLoad])
+	MCODE_F_PLUGIN_PREFIX,            // N=Plugin.Prefix(Guid,Command)
 	MCODE_F_PLUGIN_UNLOAD,            // N=Plugin.UnLoad(DllPath)
 	MCODE_F_MENU_FILTER,              // N=Menu.Filter(Action[,Mode])
 	MCODE_F_MENU_FILTERSTR,           // S=Menu.FilterStr([Action[,S]])
Index: plugins.cpp
===================================================================
--- plugins.cpp	(revision 7682)
+++ plugins.cpp	(working copy)
@@ -2474,6 +2474,205 @@
 	return FALSE;
 }
 
+// ��������� ����������� plugin.call, plugin.cmd, plugin.config � �.�
+int PluginManager::CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret/*=nullptr*/)
+{
+	BOOL Result=FALSE;
+
+	if (!ProcessException)
+	{
+		int curType = FrameManager->GetCurrentFrame()->GetType();
+		bool Editor = curType==MODALTYPE_EDITOR;
+		bool Viewer = curType==MODALTYPE_VIEWER;
+		bool Dialog = curType==MODALTYPE_DIALOG;
+
+		if (Data->CallFlags & CPT_CHECKONLY)
+		{
+			Data->pPlugin = FindPlugin(Guid);
+			if (Data->pPlugin && Data->pPlugin->Load())
+			{
+				// ������� �� ���� ������� ���� � ������ ������� (������������� ��������)
+				switch ((Data->CallFlags & CPT_MASK))
+				{
+				case CPT_CALL:
+					if (!Data->pPlugin->HasOpenPanel())
+						return FALSE;
+					break;
+				case CPT_CONFIGURE:
+					if (curType!=MODALTYPE_PANELS)
+					{
+						//TODO: ����������� �� �����?
+						return FALSE;
+					}
+					if (!Data->pPlugin->HasConfigure())
+						return FALSE;
+					break;
+				case CPT_PREFIX:
+					if (curType!=MODALTYPE_PANELS)
+					{
+						//TODO: ����������� �� �����?
+						return FALSE;
+					}
+					//TODO: OpenPanel ��� OpenFilePlugin?
+					if (!Data->pPlugin->HasOpenPanel())
+						return FALSE;
+					break;
+				case CPT_INTERNAL:
+					//TODO: ������ �����
+					if (!Data->pPlugin->HasOpenPanel())
+						return FALSE;
+					break;
+				}
+
+				UINT64 IFlags;
+				PluginInfo Info = {sizeof(Info)};
+				if (!Data->pPlugin->GetPluginInfo(&Info))
+					return FALSE;
+				else
+					IFlags = Info.Flags;
+
+				PluginMenuItem *MenuItems=nullptr;
+
+				// ������� �� ���� ������� ���� � ������ �������
+				switch ((Data->CallFlags & CPT_MASK))
+				{
+				case CPT_CALL:
+					if ((Editor && !(IFlags & PF_EDITOR)) ||
+							(Viewer && !(IFlags & PF_VIEWER)) ||
+							(Dialog && !(IFlags & PF_DIALOG)) ||
+							(!Editor && !Viewer && !Dialog && (IFlags & PF_DISABLEPANELS)))
+						return FALSE;
+					MenuItems = &Info.PluginMenu;
+					break;
+				case CPT_CONFIGURE:
+					MenuItems = &Info.PluginConfig;
+					break;
+				case CPT_PREFIX:
+					if (!Info.CommandPrefix || !*Info.CommandPrefix)
+						return FALSE;
+					break;
+				case CPT_INTERNAL:
+					break;
+				}
+
+				if ((Data->CallFlags & CPT_MASK)==CPT_CALL || (Data->CallFlags & CPT_MASK)==CPT_CONFIGURE)
+				{
+					bool ItemFound = false;
+					if (Data->ItemGuid==nullptr)
+					{
+						if (MenuItems->Count==1)
+						{
+							Data->FoundGuid=MenuItems->Guids[0];
+							Data->ItemGuid=&Data->FoundGuid;
+							ItemFound=true;
+						}
+					}
+					else
+					{
+						for (size_t i = 0; i < MenuItems->Count; i++)
+						{
+							if (memcmp(Data->ItemGuid, &(MenuItems->Guids[i]), sizeof(GUID)) == 0)
+							{
+								Data->FoundGuid=*Data->ItemGuid;
+								Data->ItemGuid=&Data->FoundGuid;
+								ItemFound=true;
+								break;
+							}
+						}
+					}
+					if (!ItemFound)
+						return FALSE;
+				}
+			}
+
+			Result=TRUE;
+		}
+		else
+		{
+			if (!Data->pPlugin)
+				return FALSE;
+
+			HANDLE hPlugin=INVALID_HANDLE_VALUE;
+			Panel *ActivePanel=nullptr;
+
+			switch ((Data->CallFlags & CPT_MASK))
+			{
+			case CPT_CALL:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					int OpenCode=OPEN_PLUGINSMENU;
+					INT_PTR Item=0;
+					OpenDlgPluginData pd;
+
+					if (Editor)
+					{
+						OpenCode=OPEN_EDITOR;
+					}
+					else if (Viewer)
+					{
+						OpenCode=OPEN_VIEWER;
+					}
+					else if (Dialog)
+					{
+						OpenCode=OPEN_DIALOG;
+						pd.hDlg=(HANDLE)FrameManager->GetCurrentFrame();
+						Item=(INT_PTR)&pd;
+					}
+
+					hPlugin=Open(Data->pPlugin,OpenCode,Data->FoundGuid,Item);
+
+					Result=TRUE;
+				}
+				break;
+
+			case CPT_CONFIGURE:
+				CtrlObject->Plugins->ConfigureCurrent(Data->pPlugin,Data->FoundGuid);
+				return TRUE;
+
+			case CPT_PREFIX:
+				{
+					ActivePanel=CtrlObject->Cp()->ActivePanel;
+					string command=Data->Command; // ����� ���� ������
+					hPlugin=Open(Data->pPlugin,OPEN_COMMANDLINE,FarGuid,(INT_PTR)command.CPtr());
+
+					Result=TRUE;
+				}
+				break;
+			case CPT_INTERNAL:
+				//TODO: ���� CallPlugin
+				//WARNING: ����, ��� �� ���������� ��� ��������� MacroState
+				break;
+			}
+
+			if (hPlugin && !Editor && !Viewer && !Dialog)
+			{
+				//BUGBUG: ������� ������? ����� �� ���?
+				//BUGBUG: � ProcessCommandLine ������ ����� Open, � � CPT_CALL - �����
+				if (ActivePanel->ProcessPluginEvent(FE_CLOSE,nullptr))
+				{
+					ClosePanel(hPlugin);
+					return FALSE;
+				}
+
+				Panel *NewPanel=CtrlObject->Cp()->ChangePanel(ActivePanel,FILE_PANEL,TRUE,TRUE);
+				NewPanel->SetPluginMode(hPlugin,L"",true);
+				NewPanel->Update(0);
+				NewPanel->Show();
+			}
+
+			// restore title for old plugins only.
+			#ifndef NO_WRAPPER
+			if (Data->pPlugin->IsOemPlugin() && Editor && CurEditor)
+			{
+				CurEditor->SetPluginTitle(nullptr);
+			}
+			#endif // NO_WRAPPER
+		}
+	}
+
+	return Result;
+}
+
 Plugin *PluginManager::FindPlugin(const GUID& SysID)
 {
 	Plugin **result=nullptr;
Index: plugins.hpp
===================================================================
--- plugins.hpp	(revision 7682)
+++ plugins.hpp	(working copy)
@@ -129,6 +129,30 @@
 	OFP_COMMANDS,
 };
 
+// �������� ����� ����������� plugin.call � �.�.
+typedef unsigned int CALLPLUGINFLAGS;
+static const CALLPLUGINFLAGS
+	CPT_CALL        = 0x00000001L,
+	CPT_CONFIGURE   = 0x00000002L,
+	CPT_PREFIX      = 0x00000004L,
+	CPT_INTERNAL    = 0x00000008L,
+	CPT_MASK        = 0x0000000FL,
+	CPT_CHECKONLY   = 0x10000000L;
+
+struct CallPluginInfo
+{
+	CALLPLUGINFLAGS CallFlags;
+	int OpenFrom;
+	union
+	{
+		GUID *ItemGuid;
+		const wchar_t *Command;
+	};
+	// ���������� � ������ CallPluginItem �� ��������� ����
+	Plugin *pPlugin;
+	GUID FoundGuid;
+};
+
 struct PluginHandle
 {
 	HANDLE hPlugin;
@@ -232,6 +256,7 @@
 
 		// $ .09.2000 SVS - ����� CallPlugin - ����� ������ �� ID � �������� OpenFrom = OPEN_*
 		int CallPlugin(const GUID& SysID,int OpenFrom, void *Data, int *Ret=nullptr);
+		int CallPluginItem(const GUID& Guid, CallPluginInfo *Data, int *Ret=nullptr);
 		Plugin *FindPlugin(const GUID& SysID);
 		static const GUID& GetGUID(HANDLE hPlugin);
 

Index: general.html
===================================================================
--- general.html	(revision 7683)
+++ general.html	(working copy)
@@ -1591,6 +1591,35 @@
   </tr>
 
   <tr>
+    <td>N=<dfn><a name="plugin.call">plugin.call</a></dfn>(Guid[,MenuGuid])</td>
+    <td><p>������ ����� ������� �� ��� �������� �� F11 ��� ������������ ������� ����� ������ ��� ����� ������ � ������.</p>
+       <p><var>Guid</var> � <var>MenuGuid</var> ����� ��������� � ������� "Plugin information" (F3 � ������): ��� "Plugin GUID" � "Plugin item GUID" ��������������.</p>
+       <p>��������� ����� ������ <var>Guid</var> �������. <var>MenuGuid</var> �������� ������� � ��� �����, ���� ������ ������������ ����� ������ ������ ���.</p>
+       <p>���� ������ ����������� � ������ F11 �� ������ ������������ - ����� ������ �����.</p>
+       <p>����� ��������� 1 - ������/����� ������ ��� 0 - � ����� �����.</p>
+       <p>������ ����������� - ����� FarColorer\Outliner list:</p>
+       <pre class="codesample"><code>%I = plugin.call("D2F36B62-A470-418D-83A3-ED7A3710E5B5","45453CAC-499D-4B37-82B8-0A77F7BD087C");
+$If (%I==1) 5 $End</code></pre>
+    </td>
+  </tr>
+
+  <tr>
+    <td>N=<dfn><a name="plugin.config">plugin.config</a></dfn>(Guid[,MenuGuid])</td>
+    <td><p>������ ����� ������� �� ��� "�������� ��������" ��� ������������ ������� ����� ������ ��� ����� ������ � ������. �������� ����� � �����.</p>
+       <p><var>Guid</var> � <var>MenuGuid</var> ����� ��������� � ������� "Plugin information" (F3 � ������): ��� "Plugin GUID" � "Plugin item GUID" ��������������.</p>
+       <p>��������� ����� ������ <var>Guid</var> �������. <var>MenuGuid</var> �������� ������� � ��� �����, ���� ������ ������������ ����� ������ ������ ���.</p>
+       <p>���� ������ ����������� � ������ "�������� ��������" ��� ��� ����� �� �� ������� - ����� ������ �����.</p>
+       <p>����� ��������� 1 - ������/����� ������ ��� 0 - � ����� �����.</p>
+    </td>
+  </tr>
+
+  <tr>
+    <td>N=<dfn><a name="plugin.int">plugin.int</a></dfn>(Guid[,param])</td>
+    <td><p>����� ������ <dfn><a href="#callplugin">callplugin</a></dfn>.</p>
+    </td>
+  </tr>
+
+  <tr>
     <td>N=<dfn><a name="plugin.load">plugin.load</a></dfn>(DllPath[,ForceLoad])</td>
     <td><p>�������� ������ � ������ dll-����� <var>DllPath</var>. ���� ������ <var>ForceLoad</var>, ������ �� 0, �� ������ ���������� ����� � ����.</p>
        <p>����� ��������� 1 - ������ �������� ��� 0 - � ����� �����.</p>
@@ -1598,6 +1627,15 @@
   </tr>
 
   <tr>
+    <td>N=<dfn><a name="plugin.prefix">plugin.prefix</a></dfn>(Guid,Command)</td>
+    <td><p>������ ����� ������� �� �������� �� ������� ��� ������������ ���������/����/�������������� ������ ���������� ��������� ������.</p>
+       <p><var>Guid</var> ����� ��������� � ������� "Plugin information" (F3 � ������ F11 ��� AltShiftF9): ���� "Plugin GUID".</p>
+       <p>���� ������ � ����� <var>Guid</var> �� ������������ ���� �� �������� ��� ��� ����� �� �� ������� - ����� ������ �����.</p>
+       <p>����� ��������� 1 - ������/����� ������ ��� 0 - � ����� �����.</p>
+    </td>
+  </tr>
+
+  <tr>
     <td>N=<dfn><a name="plugin.unload">plugin.unload</a></dfn>(DllPath)</td>
     <td><p>������� ������ � ������ dll-����� <var>DllPath</var>.</p>
        <p>����� ��������� 1 - ������ ������� ��� 0 - � ����� �����.</p>

Index: general.html
===================================================================
--- general.html	(revision 7701)
+++ general.html	(working copy)
@@ -1603,7 +1603,7 @@
   </tr>
 
   <tr>
-    <td>N=<dfn><a name="plugin.int">plugin.call</a></dfn>(Guid[,param])</td>
+    <td>N=<dfn><a name="plugin.call">plugin.call</a></dfn>(Guid[,param])</td>
     <td><p>������ ������ <dfn><a href="#callplugin">callplugin</a></dfn>.</p>
     </td>
   </tr>