2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e120edab056..5f75c69b96a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2012-07-21  Eli Zaretskii  <eliz@gnu.org>
 
+        * keyboard.c (keys_of_keyboard): Bind language-change to 'ignore'
+        in special-event-map.  See the discussion at
+        http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html
+        for the reasons.
+
         * w32menu.c (add_menu_item): Cast to UINT_PTR when assigning
         info.dwItemData.  Fixes crashes on 64-bit Windows.  Suggested by
         Fabrice Popineau <fabrice.popineau@supelec.fr>.
diff --git a/src/keyboard.c b/src/keyboard.c
index 5e6dca64a92..0c03a2143d8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12232,6 +12232,10 @@ keys_of_keyboard (void)
 
   initial_define_lispy_key (Vspecial_event_map, "config-changed-event",
                             "ignore");
+#if defined (WINDOWSNT)
+  initial_define_lispy_key (Vspecial_event_map, "language-change",
+                            "ignore");
+#endif
 }
 
 /* Mark the pointers in the kboard objects.