mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 07:41:28 -08:00
Code Issues Projects Releases Wiki Activity

Fix a couple of recent inadvertent breaks of the MSDOS port.

Browse source 
src/msdos.c: include required menu.h
src/term.c: set correct menu_show_hook on MSDOS.
This commit is contained in:
Reuben Thomas 2014-08-10 17:28:36 +01:00
parent 109c0de984
commit 643a030396
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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)

1
src/msdos.c
View file

@ -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"

4
src/term.c
View file

@ -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;