LuaFAR: BreakKey в far.Menu() сделан полностью регистронезависимым.

FarGroup · Aug 22, 2016 · 4298c36 · 4298c36
1 parent 57c65b4
commit 4298c36
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 1, 0, 0, 581 },
+    Version       = { 1, 0, 0, 582 },
     MinFarVersion = { 3, 0, 0, 4582 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 13.08.2016 18:24:05 +0200 - build 581
+shmuel 22.08.2016 19:14:55 +0200 - build 582
+
+1. LuaFAR: BreakKey в far.Menu() сделан полностью регистронезависимым.
+
+shmuel 13.08.2016 18:24:05 +0200 - build 581
 
 1. Уточнения 579,580.
 

diff --git a/plugins/luamacro/luafar/service.c b/plugins/luamacro/luafar/service.c
@@ -1723,11 +1723,13 @@ static int far_Menu(lua_State *L)
 				if(strchr(buf,'A')) mod |= LEFT_ALT_PRESSED;
 
 				if(strchr(buf,'S')) mod |= SHIFT_PRESSED;
-
-				// replace on stack: break key name with virtual key name
-				lua_pop(L, 1);
-				lua_pushstring(L, vk);        // vk=-4; bk=-3;bki=-2;vknm=-1;
 			}
+			else
+				vk = buf;
+
+			// replace on stack: break key name with virtual key name
+			lua_pop(L, 1);
+			lua_pushstring(L, vk);        // vk=-4; bk=-3;bki=-2;vknm=-1;
 
 			// get virtual key and break key values
 			lua_rawget(L,-4);               // vk=-4; bk=-3;

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