diff options
author | Eli Zaretskii <eliz@gnu.org> | 2014-06-04 10:54:16 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2014-06-04 10:54:16 +0300 |
commit | 5dff48b0f8a399899f72e1fcf2db0a552f071070 (patch) | |
tree | bfa2950c42f524231d64875e569f163ac47d4f7e /src/w32console.c | |
parent | cfd794af4214ae0e5587ab8b1f4e5fcb355a0f12 (diff) | |
download | emacs-5dff48b0f8a399899f72e1fcf2db0a552f071070.tar.gz |
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.
Diffstat (limited to 'src/w32console.c')
-rw-r--r-- | src/w32console.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 <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; |