[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117681: Fix a couple of recent inadvertent breaks o
From: |
Reuben Thomas |
Subject: |
[Emacs-diffs] trunk r117681: Fix a couple of recent inadvertent breaks of the MSDOS port. |
Date: |
Sun, 10 Aug 2014 16:29:05 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117681
revision-id: address@hidden
parent: address@hidden
committer: Reuben Thomas <address@hidden>
branch nick: trunk
timestamp: Sun 2014-08-10 17:28:36 +0100
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/msdos.c msdos.c-20091113204419-o5vbwnq5f7feedwu-656
src/term.c term.c-20091113204419-o5vbwnq5f7feedwu-220
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-08-10 08:26:28 +0000
+++ b/src/ChangeLog 2014-08-10 16:28:36 +0000
@@ -1,3 +1,9 @@
+2014-08-10 Reuben Thomas <address@hidden>
+
+ 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 <address@hidden>
Fix handling of menu bar line on TTY frames (Bug#18136)
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2014-08-09 16:12:33 +0000
+++ b/src/msdos.c 2014-08-10 16:28:36 +0000
@@ -71,6 +71,7 @@
#include "coding.h"
#include "disptab.h"
#include "window.h"
+#include "menu.h"
#include "buffer.h"
#include "commands.h"
#include "blockinput.h"
=== modified file 'src/term.c'
--- a/src/term.c 2014-08-10 08:26:28 +0000
+++ b/src/term.c 2014-08-10 16:28:36 +0000
@@ -3936,7 +3936,11 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117681: Fix a couple of recent inadvertent breaks of the MSDOS port.,
Reuben Thomas <=