unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#18234: Unbreak the DOS build
@ 2014-08-09 21:56 Reuben Thomas
  2014-08-10  2:52 ` Eli Zaretskii
  0 siblings, 1 reply; 3+ messages in thread
From: Reuben Thomas @ 2014-08-09 21:56 UTC (permalink / raw)
  To: 18234

[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]

The following patch is, I believe, necessary and sufficient to fix some
minor breakage recently inadvertently perpetrated on the MS-DOS build:

=== modified file 'src/msdos.c'
--- src/msdos.c    2014-08-09 16:12:33 +0000
+++ src/msdos.c    2014-08-09 21:51:56 +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'
--- src/term.c    2014-07-27 13:21:30 +0000
+++ src/term.c    2014-08-09 11:15:08 +0000
@@ -3935,7 +3935,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;

But until I know my way around the DOS code better I thought I should get a
second opinion.

-- 
http://rrt.sc3d.org

[-- Attachment #2: Type: text/html, Size: 1601 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#18234: Unbreak the DOS build
  2014-08-09 21:56 bug#18234: Unbreak the DOS build Reuben Thomas
@ 2014-08-10  2:52 ` Eli Zaretskii
  2014-08-10 16:29   ` Reuben Thomas
  0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2014-08-10  2:52 UTC (permalink / raw)
  To: Reuben Thomas; +Cc: 18234

> Date: Sat, 9 Aug 2014 22:56:16 +0100
> From: Reuben Thomas <rrt@sc3d.org>
> 
> The following patch is, I believe, necessary and sufficient to fix some
> minor breakage recently inadvertently perpetrated on the MS-DOS build:

Looks OK, please go ahead and commit.





^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#18234: Unbreak the DOS build
  2014-08-10  2:52 ` Eli Zaretskii
@ 2014-08-10 16:29   ` Reuben Thomas
  0 siblings, 0 replies; 3+ messages in thread
From: Reuben Thomas @ 2014-08-10 16:29 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: 18234-done

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

On 10 August 2014 03:52, Eli Zaretskii <eliz@gnu.org> wrote:

> > Date: Sat, 9 Aug 2014 22:56:16 +0100
> > From: Reuben Thomas <rrt@sc3d.org>
> >
> > The following patch is, I believe, necessary and sufficient to fix some
> > minor breakage recently inadvertently perpetrated on the MS-DOS build:
>
> Looks OK, please go ahead and commit.
>

I've installed the patch, thanks for the review.

-- 
http://rrt.sc3d.org

[-- Attachment #2: Type: text/html, Size: 899 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-08-10 16:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-09 21:56 bug#18234: Unbreak the DOS build Reuben Thomas
2014-08-10  2:52 ` Eli Zaretskii
2014-08-10 16:29   ` Reuben Thomas

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).