Merge from origin/emacs-25

[gnu-emacs] / src / w32console.c

diff --git a/src/w32console.c b/src/w32console.c
index 7fffabf38535aba61ab6865dc097246b5edceeea..82ba4b1cf9ce9b98225ae73586869846a11caaeb 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -1,12 +1,12 @@
 /* Terminal hooks for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1992, 1999, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -759,6 +759,9 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
 
   /* Setup w32_display_info structure for this frame. */
   w32_initialize_display_info (build_string ("Console"));
+
+  /* Set up the keyboard hook.  */
+  setup_w32_kbdhook ();
 }