From 6b064c16b1761605c87c0d3dbee91f6c3f6030d0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 7 Nov 2012 23:48:18 +0200 Subject: [PATCH] Fix Num Lock handling related to bug #12806. src/w32fns.c (modifier_set): Don't include Num Lock in the reported modifiers. --- src/ChangeLog | 3 +-- src/w32fns.c | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 04b66ba7cc7..0eb69f59efe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,8 +3,7 @@ * w32fns.c (modifier_set): Don't report modifiers from toggle key, such as Scroll Lock, if the respective keys are treated as function keys, not as modifiers. This avoids destroying non-ASCII - keyboard input when Scroll Lock is toggled ON. (Bug#1280) - (modifier_set): Do not omit checking the Num Lock key. + keyboard input when Scroll Lock is toggled ON. (Bug#12806) 2012-11-07 Dmitry Antipov diff --git a/src/w32fns.c b/src/w32fns.c index b5e717f8980..f4f5aad90b4 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2099,13 +2099,6 @@ modifier_set (int vkey) else return (GetKeyState (vkey) & 0x1); } - if (vkey == VK_NUMLOCK) - { - if (NILP (Vw32_enable_num_lock)) - return 0; - else - return (GetKeyState (vkey) & 0x1); - } if (!modifiers_recorded) return (GetKeyState (vkey) & 0x8000); -- 2.39.5