diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_w32.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |