upstream

3 files changed, 31 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 37907cd555a..0eb69f59efe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2012-11-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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#12806)
+
+2012-11-07  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xfns.c (Fx_wm_set_size_hint): Use check_x_frame.  Adjust docstring.
+
 2012-11-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Restore some duplicate definitions (Bug#12814).
diff --git a/src/w32fns.c b/src/w32fns.c
index 24760054523..f4f5aad90b4 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2085,8 +2085,21 @@ sync_modifiers (void)
 static int
 modifier_set (int vkey)
 {
-  if (vkey == VK_CAPITAL || vkey == VK_SCROLL)
-    return (GetKeyState (vkey) & 0x1);
+  if (vkey == VK_CAPITAL)
+    {
+      if (NILP (Vw32_enable_caps_lock))
+        return 0;
+      else
+        return (GetKeyState (vkey) & 0x1);
+    }
+  if (vkey == VK_SCROLL)
+    {
+      if (NILP (Vw32_scroll_lock_modifier))
+        return 0;
+      else
+        return (GetKeyState (vkey) & 0x1);
+    }
+
   if (!modifiers_recorded)
     return (GetKeyState (vkey) & 0x8000);
 
diff --git a/src/xfns.c b/src/xfns.c
index 9c99902b93d..82e218479c8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2996,16 +2996,14 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms)
 DEFUN ("x-wm-set-size-hint", Fx_wm_set_size_hint, Sx_wm_set_size_hint,
        0, 1, 0,
        doc: /* Send the size hints for frame FRAME to the window manager.
-If FRAME is nil, use the selected frame.  */)
+If FRAME is omitted or nil, use the selected frame.
+Signal error if FRAME is not an X frame.  */)
   (Lisp_Object frame)
 {
-  struct frame *f;
-  if (NILP (frame))
-    frame = selected_frame;
-  f = XFRAME (frame);
+  struct frame *f = check_x_frame (frame);
+
   block_input ();
-  if (FRAME_X_P (f))
-    x_wm_set_size_hint (f, 0, 0);
+  x_wm_set_size_hint (f, 0, 0);
   unblock_input ();
   return Qnil;
 }