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 @@
         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.
 
 2012-11-07  Dmitry Antipov  <dmantipov@yandex.ru>
 
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)
 static int
 modifier_set (int vkey)
 {
-  if (vkey == VK_CAPITAL || vkey == VK_SCROLL)
+  if (vkey == VK_CAPITAL || vkey == VK_SCROLL || vkey == VK_NUMLOCK)
     return (GetKeyState (vkey) & 0x1);
   if (!modifiers_recorded)
     return (GetKeyState (vkey) & 0x8000);