GNU bug report logs - #18234
Unbreak the DOS build

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 18234 in the body.
You can then email your comments to 18234 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Reuben Thomas <rrt <at> sc3d.org>
To: bug-emacs <bug-emacs <at> gnu.org>
Subject: Unbreak the DOS build
Date: Sat, 9 Aug 2014 22:56:16 +0100

[Message part 1 (text/plain, inline)]

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

[Message part 2 (text/html, inline)]

Message #10 received at 18234 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Reuben Thomas <rrt <at> sc3d.org>
Cc: 18234 <at> debbugs.gnu.org
Subject: Re: bug#18234: Unbreak the DOS build
Date: Sun, 10 Aug 2014 05:52:23 +0300

> Date: Sat, 9 Aug 2014 22:56:16 +0100
> From: Reuben Thomas <rrt <at> 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.

Message #15 received at 18234-done <at> debbugs.gnu.org (full text, mbox):

From: Reuben Thomas <rrt <at> sc3d.org>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 18234-done <at> debbugs.gnu.org
Subject: Re: bug#18234: Unbreak the DOS build
Date: Sun, 10 Aug 2014 17:29:52 +0100

[Message part 1 (text/plain, inline)]

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

> > Date: Sat, 9 Aug 2014 22:56:16 +0100
> > From: Reuben Thomas <rrt <at> 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

[Message part 2 (text/html, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.