Commit 6b064c16 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix Num Lock handling related to bug #12806.

 src/w32fns.c (modifier_set): Don't include Num Lock in the reported
 modifiers.
parent dab72075
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
* w32fns.c (modifier_set): Don't report modifiers from toggle key, * w32fns.c (modifier_set): Don't report modifiers from toggle key,
such as Scroll Lock, if the respective keys are treated as such as Scroll Lock, if the respective keys are treated as
function keys, not as modifiers. This avoids destroying non-ASCII function keys, not as modifiers. This avoids destroying non-ASCII
keyboard input when Scroll Lock is toggled ON. (Bug#1280) keyboard input when Scroll Lock is toggled ON. (Bug#12806)
(modifier_set): Do not omit checking the Num Lock key.
   
2012-11-07 Dmitry Antipov <dmantipov@yandex.ru> 2012-11-07 Dmitry Antipov <dmantipov@yandex.ru>
   
......
...@@ -2099,13 +2099,6 @@ modifier_set (int vkey) ...@@ -2099,13 +2099,6 @@ modifier_set (int vkey)
else else
return (GetKeyState (vkey) & 0x1); return (GetKeyState (vkey) & 0x1);
} }
if (vkey == VK_NUMLOCK)
{
if (NILP (Vw32_enable_num_lock))
return 0;
else
return (GetKeyState (vkey) & 0x1);
}
if (!modifiers_recorded) if (!modifiers_recorded)
return (GetKeyState (vkey) & 0x8000); return (GetKeyState (vkey) & 0x8000);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment