From 5dff48b0f8a399899f72e1fcf2db0a552f071070 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 4 Jun 2014 10:54:16 +0300 Subject: [PATCH] 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. --- src/ChangeLog | 5 +++++ src/w32console.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index bf46f8e7f1e..7903a0f5039 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-06-04 Eli Zaretskii + + * w32console.c (initialize_w32_display): Set the console + menu_show_hook, otherwise TTY menus are broken on w32. + 2014-06-04 Dmitry Antipov Use terminal-specific hooks to display menus. diff --git a/src/w32console.c b/src/w32console.c index e3ca2f86b8d..2fbc190ee2d 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -36,8 +36,9 @@ along with GNU Emacs. If not, see . */ #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; -- 2.39.2