aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Brown2013-03-23 20:16:11 -0400
committerKen Brown2013-03-23 20:16:11 -0400
commit4f3576ee215dfeb6920c1c7003cba9b15bccd8f3 (patch)
tree3563b5f8df0f54221ab992f62776e13cac35936d /src
parentbde73d272008310f7d84575088bb94c034c6b7a7 (diff)
downloademacs-4f3576ee215dfeb6920c1c7003cba9b15bccd8f3.tar.gz
emacs-4f3576ee215dfeb6920c1c7003cba9b15bccd8f3.zip
* src/w32term.c (w32_initialize): Silence compiler warning.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32term.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 62f210583ee..a3747844c65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-03-24 Ken Brown <kbrown@cornell.edu>
2
3 * w32term.c (w32_initialize): Silence compiler warning.
4
12013-03-23 Eli Zaretskii <eliz@gnu.org> 52013-03-23 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32term.c (w32fullscreen_hook): Use FRAME_NORMAL_WIDTH, 7 * w32term.c (w32fullscreen_hook): Use FRAME_NORMAL_WIDTH,
diff --git a/src/w32term.c b/src/w32term.c
index 66d11164594..e02b5a61229 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6662,7 +6662,7 @@ w32_initialize (void)
6662 Fset_input_mode (Qnil, Qnil, make_number (2), Qnil); 6662 Fset_input_mode (Qnil, Qnil, make_number (2), Qnil);
6663 6663
6664 { 6664 {
6665 DWORD input_locale_id = (DWORD) GetKeyboardLayout (0); 6665 DWORD input_locale_id = ((DWORD_PTR) GetKeyboardLayout (0) & 0xffffffff);
6666 w32_keyboard_codepage = 6666 w32_keyboard_codepage =
6667 codepage_for_locale ((LCID) (input_locale_id & 0xffff)); 6667 codepage_for_locale ((LCID) (input_locale_id & 0xffff));
6668 } 6668 }