Fix TTY menus on MS-Windows broken by last commit.

 src/w32console.c (initialize_w32_display): Set the console
 menu_show_hook, otherwise TTY menus on w32 crash and burn.

diff --git a/src/ChangeLog b/src/ChangeLog
index bf46f8e7f1e6cb0efbb97ca01e39325a1b016c7e..7903a0f5039310ebe2f589dfc04fa89d7f2d6570 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32console.c (initialize_w32_display): Set the console
+       menu_show_hook, otherwise TTY menus are broken on w32.
+
 2014-06-04  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Use terminal-specific hooks to display menus.

diff --git a/src/w32console.c b/src/w32console.c
index e3ca2f86b8da44bd1671a07a18cbb8dc095e103e..2fbc190ee2d702937c61438bb2ee7c45f4e5ec84 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -36,8 +36,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termhooks.h"
 #include "termchar.h"
 #include "dispextern.h"
+#include "menu.h"      /* for tty_menu_show */
 #include "w32term.h"
-#include "w32common.h" /* for os_subtype */
+#include "w32common.h" /* for os_subtype */
 #include "w32inevt.h"
 
 /* from window.c */
@@ -650,6 +651,7 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
 
   term->read_socket_hook = w32_console_read_socket;
   term->mouse_position_hook = w32_console_mouse_position;
+  term->menu_show_hook = tty_menu_show;
 
   /* The following are not used on the console.  */
   term->frame_rehighlight_hook = 0;