summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Sharonov <anton.sharonov@gmail.com>2022-07-31 12:26:05 +0100
committerBram Moolenaar <Bram@vim.org>2022-07-31 12:26:05 +0100
commit6b568b1cc75e6c4d4a3ec95d7867c7a22e98eba1 (patch)
tree85411629d1035c4e6badbbe85be446c41f7583ae
parentdbdcc799109f0893856f07e03214206723cfdcf6 (diff)
downloadvim-git-9.0.0120.tar.gz
patch 9.0.0120: MS-Windows GUI: cannot use AltGr + Spacev9.0.0120
Problem: MS-Windows GUI: cannot use AltGr + Space. Solution: Check for VK_MENU instead of VK_LMENU. (Anton Sharonov, closes #10820, closes #10753)
-rw-r--r--src/gui_w32.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 397dd7f90..20b0a5f64 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2047,7 +2047,7 @@ process_message(void)
{
// ignore VK_SPACE when ALT key pressed: system menu
if (special_keys[i].key_sym == vk
- && (vk != VK_SPACE || !(GetKeyState(VK_LMENU) & 0x8000)))
+ && (vk != VK_SPACE || !(GetKeyState(VK_MENU) & 0x8000)))
{
/*
* Behave as expected if we have a dead key and the special key
@@ -2055,7 +2055,8 @@ process_message(void)
* character output (such as a NUMPAD printable character or
* the TAB key, etc...).
*/
- if (dead_key == DEAD_KEY_SET_DEFAULT && (special_keys[i].vim_code0 == 'K'
+ if (dead_key == DEAD_KEY_SET_DEFAULT
+ && (special_keys[i].vim_code0 == 'K'
|| vk == VK_TAB || vk == CAR))
{
outputDeadKey_rePost(msg);
diff --git a/src/version.c b/src/version.c
index 0a38f3967..c5b767974 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 120,
+/**/
119,
/**/
118,