]> git.eshelyaron.com Git - emacs.git/commitdiff
* src/w32term.c (w32_initialize): Silence compiler warning.
authorKen Brown <kbrown@cornell.edu>
Sun, 24 Mar 2013 00:16:11 +0000 (20:16 -0400)
committerKen Brown <kbrown@cornell.edu>
Sun, 24 Mar 2013 00:16:11 +0000 (20:16 -0400)
src/ChangeLog
src/w32term.c

index 62f210583eebd36ca93f00135ad11d2a2e89ce28..a3747844c65cfca39067e3e06679def59036608e 100644 (file)
@@ -1,3 +1,7 @@
+2013-03-24  Ken Brown  <kbrown@cornell.edu>
+
+       * w32term.c (w32_initialize): Silence compiler warning.
+
 2013-03-23  Eli Zaretskii  <eliz@gnu.org>
 
        * w32term.c (w32fullscreen_hook): Use FRAME_NORMAL_WIDTH,
index 66d111645947d835d4c5749e9bbed22c319440cc..e02b5a612294487fdf30bddc871eda85aceea223 100644 (file)
@@ -6662,7 +6662,7 @@ w32_initialize (void)
   Fset_input_mode (Qnil, Qnil, make_number (2), Qnil);
 
   {
-    DWORD input_locale_id = (DWORD) GetKeyboardLayout (0);
+    DWORD input_locale_id = ((DWORD_PTR) GetKeyboardLayout (0) & 0xffffffff);
     w32_keyboard_codepage =
       codepage_for_locale ((LCID) (input_locale_id & 0xffff));
   }