Fix Num Lock handling related to bug #12806.

 src/w32fns.c (modifier_set): Don't include Num Lock in the reported
 modifiers.

diff --git a/src/ChangeLog b/src/ChangeLog
index 04b66ba7cc7ad99ef629b03e53d11dd9e44937d1..0eb69f59efe01d9780ed955db5a3ff5c4cac263c 100644 (file)
--- 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  <dmantipov@yandex.ru>
 

diff --git a/src/w32fns.c b/src/w32fns.c
index b5e717f8980f1eaad1ce4eb7b2c14a1435e15574..f4f5aad90b49bec3ec8fb4fac25b96cd4242d561 100644 (file)
--- 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);