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.

diff --git a/src/ChangeLog b/src/ChangeLog
index fb941916c45bd4be12641fe97d3728fe95a3fd89..0bc8a712112f8fd0c532b583977b5f32f4d25c25 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-10  Reuben Thomas  <rrt@sc3d.org>
+
+       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  <rudalics@gmx.at>
 
        Fix handling of menu bar line on TTY frames (Bug#18136)

diff --git a/src/msdos.c b/src/msdos.c
index 9fe078d0746a758a152f813e372199b59d28da88..dae86b5a3b26dc338d49635f4c6158505badc790 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -71,6 +71,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 9afd3b872b078ff41148c22954142366f9f8feab..af1b62ccaaff611049c60657289cf7923a4802a0 100644 (file)
--- 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;