[Emacs-diffs] /srv/bzr/emacs/trunk r110826: Fix Num Lock handling related to bug #12806.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110826
fixes bug: http://debbugs.gnu.org/12806
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-07 23:48:18 +0200
message:
  Fix Num Lock handling related to bug #12806.
  
   src/w32fns.c (modifier_set): Don't include Num Lock in the reported
   modifiers.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-07 21:12:25 +0000
+++ b/src/ChangeLog     2012-11-07 21:48:18 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-11-07 21:12:25 +0000
+++ b/src/w32fns.c      2012-11-07 21:48:18 +0000
@@ -2099,13 +2099,6 @@
       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);