LuaFAR (generic plugin): "%FARPROFILE%\luafar_init.lua" is run by def…

…ault
FarGroup · Jan 29, 2025 · a54fdb0 · a54fdb0
1 parent ab23357
commit a54fdb0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/enc/enc_lua/luafar_manual.tsi b/enc/enc_lua/luafar_manual.tsi
@@ -205,7 +205,7 @@ lv=2
 dt=Text
 nm=luafar_init.lua
 ctime=3639761849
-mtime=3639831155
+mtime=3947344487
 <article>
 #_<markdown>
 #_
@@ -215,7 +215,7 @@ mtime=3639831155
 #_It is **not** executed when the default script is reloaded due to `far.ReloadDefaultScript == true`.
 #_
 #_### Note
-#_This feature is disabled by default. To enable it, add `-DRUN_LUAFAR_INIT` to compilation flags.
+#_This feature is enabled by default. To disable it, add `-DNO_RUN_LUAFAR_INIT` to compilation flags.
 #_
 #_See also:<br>
 #_[`LF_LuafarInit`](510.html)<br>

diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 865 },
+    Version       = { 3, 0, 0, 866 },
     MinFarVersion = { 3, 0, 0, 6422 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,3 +1,11 @@
+shmuel 2025-01-29 20:14:04+02:00 - build 866
+
+1. LuaFAR (generic plugin): "%FARPROFILE%\luafar_init.lua" is run by default.
+   That can be prevented by defining a compilation flag -DNO_RUN_LUAFAR_INIT.
+
+2. Plugin LuaMacro is built with this flag not defined.
+
+
 MZK 2025-01-25 20:59:20-05:00 - build 865
 
 1. gh-802: Macro API to report VMenu alignment state: Menu.HorizontalAlignment.

diff --git a/plugins/luamacro/luafar/luaplug.c b/plugins/luamacro/luafar/luaplug.c
@@ -132,7 +132,7 @@ __declspec(dllexport) int luaopen_luaplug(lua_State *L)
 static void InitLuaState2(lua_State *L, TPluginData* PluginData)
 {
 	LF_InitLuaState2(L, PluginData);
-#ifdef RUN_LUAFAR_INIT
+#ifndef NO_RUN_LUAFAR_INIT
 	LF_RunLuafarInit(L);
 #endif
 	lua_pushcfunction(L, luaopen_luaplug);

diff --git a/plugins/luamacro/luafar/version.h b/plugins/luamacro/luafar/version.h
@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 865
+#define PLUGIN_BUILD 866
diff --git a/plugins/luamacro/luamacro.vcxproj b/plugins/luamacro/luamacro.vcxproj
@@ -19,7 +19,7 @@
   </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>EXPORT_OPEN;EXPORT_PROCESSEDITOREVENT;EXPORT_PROCESSEDITORINPUT;EXPORT_PROCESSCONSOLEINPUT;EXPORT_PROCESSVIEWEREVENT;EXPORT_PROCESSDIALOGEVENT;EXPORT_CONFIGURE;EXPORT_ANALYSE;EXPORT_CLOSEPANEL;EXPORT_COMPARE;EXPORT_DELETEFILES;EXPORT_GETFILES;EXPORT_GETFINDDATA;EXPORT_GETOPENPANELINFO;EXPORT_MAKEDIRECTORY;EXPORT_PROCESSHOSTFILE;EXPORT_PROCESSPANELEVENT;EXPORT_PROCESSPANELINPUT;EXPORT_PUTFILES;EXPORT_SETDIRECTORY;EXPORT_SETFINDLIST;EXPORT_GETCONTENTDATA;RUN_LUAFAR_INIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>EXPORT_OPEN;EXPORT_PROCESSEDITOREVENT;EXPORT_PROCESSEDITORINPUT;EXPORT_PROCESSCONSOLEINPUT;EXPORT_PROCESSVIEWEREVENT;EXPORT_PROCESSDIALOGEVENT;EXPORT_CONFIGURE;EXPORT_ANALYSE;EXPORT_CLOSEPANEL;EXPORT_COMPARE;EXPORT_DELETEFILES;EXPORT_GETFILES;EXPORT_GETFINDDATA;EXPORT_GETOPENPANELINFO;EXPORT_MAKEDIRECTORY;EXPORT_PROCESSHOSTFILE;EXPORT_PROCESSPANELEVENT;EXPORT_PROCESSPANELINPUT;EXPORT_PUTFILES;EXPORT_SETDIRECTORY;EXPORT_SETFINDLIST;EXPORT_GETCONTENTDATA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>luasdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

diff --git a/plugins/luamacro/makefile_gcc b/plugins/luamacro/makefile_gcc
@@ -31,7 +31,6 @@ USERC = \
 	-DEXPORT_SETDIRECTORY \
 	-DEXPORT_SETFINDLIST \
 	-DEXPORT_GETCONTENTDATA \
-	-DRUN_LUAFAR_INIT \
 
 USERC += \
 	-Wno-cast-align \

diff --git a/plugins/luamacro/makefile_vc b/plugins/luamacro/makefile_vc
@@ -6,8 +6,7 @@ USERCPP=/Iluasdk/include /DEXPORT_OPEN /DEXPORT_CONFIGURE \
         /DEXPORT_ANALYSE /DEXPORT_CLOSEPANEL /DEXPORT_COMPARE /DEXPORT_DELETEFILES \
         /DEXPORT_GETFILES /DEXPORT_GETFINDDATA /DEXPORT_GETOPENPANELINFO /DEXPORT_MAKEDIRECTORY \
         /DEXPORT_PROCESSHOSTFILE /DEXPORT_PROCESSPANELEVENT /DEXPORT_PROCESSPANELINPUT \
-        /DEXPORT_PUTFILES /DEXPORT_SETDIRECTORY /DEXPORT_SETFINDLIST /DEXPORT_GETCONTENTDATA \
-        /DRUN_LUAFAR_INIT
+        /DEXPORT_PUTFILES /DEXPORT_SETDIRECTORY /DEXPORT_SETFINDLIST /DEXPORT_GETCONTENTDATA
 
 LUALIB=$(INTDIR)\luafar3.lib