aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-07 19:33:14 +0200
committerEli Zaretskii2012-11-07 19:33:14 +0200
commitb666f18d4d22b2808488fc785e579e9d5afb6eb5 (patch)
tree3233f1c630ebea6047601db7fab2b08b3f8f4540 /src
parent499a0f7a985e28139433a3028f8edd7eca445d2c (diff)
downloademacs-b666f18d4d22b2808488fc785e579e9d5afb6eb5.tar.gz
emacs-b666f18d4d22b2808488fc785e579e9d5afb6eb5.zip
Include Num Lock in test for modifier keys on MS-Windows.
src/w32fns.c (modifier_set): Do not omit checking the Num Lock key.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/w32fns.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 77faa94207e..c1b42e276c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,7 @@
5 respective keys are treated as function keys, not as modifiers. 5 respective keys are treated as function keys, not as modifiers.
6 This avoids destroying non-ASCII keyboard input when Scroll Lock 6 This avoids destroying non-ASCII keyboard input when Scroll Lock
7 is toggled ON. (Bug#1280) 7 is toggled ON. (Bug#1280)
8 (modifier_set): Do not omit checking the Num Lock key.
8 9
92012-11-07 Dmitry Antipov <dmantipov@yandex.ru> 102012-11-07 Dmitry Antipov <dmantipov@yandex.ru>
10 11
diff --git a/src/w32fns.c b/src/w32fns.c
index e9e19502479..dc395551a4a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2085,7 +2085,7 @@ sync_modifiers (void)
2085static int 2085static int
2086modifier_set (int vkey) 2086modifier_set (int vkey)
2087{ 2087{
2088 if (vkey == VK_CAPITAL || vkey == VK_SCROLL) 2088 if (vkey == VK_CAPITAL || vkey == VK_SCROLL || vkey == VK_NUMLOCK)
2089 return (GetKeyState (vkey) & 0x1); 2089 return (GetKeyState (vkey) & 0x1);
2090 if (!modifiers_recorded) 2090 if (!modifiers_recorded)
2091 return (GetKeyState (vkey) & 0x8000); 2091 return (GetKeyState (vkey) & 0x8000);