From 643a0303965c233b66d7ebfd5b2c045253dea3be Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sun, 10 Aug 2014 17:28:36 +0100 Subject: [PATCH] Fix a couple of recent inadvertent breaks of the MSDOS port. src/msdos.c: include required menu.h src/term.c: set correct menu_show_hook on MSDOS. --- src/ChangeLog | 6 ++++++ src/msdos.c | 1 + src/term.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index fb941916c45..0bc8a712112 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-08-10 Reuben Thomas + + Fix a couple of recent inadvertent breaks of the MSDOS port. + * msdos.c: include required menu.h + * term.c: set correct menu_show_hook on MSDOS. + 2014-08-10 Martin Rudalics Fix handling of menu bar line on TTY frames (Bug#18136) diff --git a/src/msdos.c b/src/msdos.c index 9fe078d0746..dae86b5a3b2 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -71,6 +71,7 @@ along with GNU Emacs. If not, see . */ #include "coding.h" #include "disptab.h" #include "window.h" +#include "menu.h" #include "buffer.h" #include "commands.h" #include "blockinput.h" diff --git a/src/term.c b/src/term.c index 9afd3b872b0..af1b62ccaaf 100644 --- a/src/term.c +++ b/src/term.c @@ -3936,7 +3936,11 @@ set_tty_hooks (struct terminal *terminal) terminal->reset_terminal_modes_hook = &tty_reset_terminal_modes; terminal->set_terminal_modes_hook = &tty_set_terminal_modes; terminal->update_end_hook = &tty_update_end; +#ifdef MSDOS + terminal->menu_show_hook = &x_menu_show; +#else terminal->menu_show_hook = &tty_menu_show; +#endif terminal->set_terminal_window_hook = &tty_set_terminal_window; terminal->read_socket_hook = &tty_read_avail_input; /* keyboard.c */ terminal->delete_frame_hook = &tty_free_frame_resources; -- 2.39.5