unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Reuben Thomas <rrt@sc3d.org>
To: 18234@debbugs.gnu.org
Subject: bug#18234: Unbreak the DOS build
Date: Sat, 9 Aug 2014 22:56:16 +0100	[thread overview]
Message-ID: <CAOnWdoi4fXi0YEZJN1uqUwJJCHJmLsrToHf=Ww7zc0xxsmf17w@mail.gmail.com> (raw)

[-- 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 --]

             reply	other threads:[~2014-08-09 21:56 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-09 21:56 Reuben Thomas [this message]
2014-08-10  2:52 ` bug#18234: Unbreak the DOS build Eli Zaretskii
2014-08-10 16:29   ` Reuben Thomas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAOnWdoi4fXi0YEZJN1uqUwJJCHJmLsrToHf=Ww7zc0xxsmf17w@mail.gmail.com' \
    --to=rrt@sc3d.org \
    --cc=18234@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).