From unknown Sat Aug 16 16:13:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18234: Unbreak the DOS build Resent-From: Reuben Thomas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 09 Aug 2014 21:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18234 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 18234@debbugs.gnu.org X-Debbugs-Original-To: bug-emacs Received: via spool by submit@debbugs.gnu.org id=B.140762139725764 (code B ref -1); Sat, 09 Aug 2014 21:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Aug 2014 21:56:37 +0000 Received: from localhost ([127.0.0.1]:36789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGEcu-0006hT-6i for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58804) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGEcr-0006hF-BX for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEcl-00064A-2l for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,HTML_MESSAGE, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEcl-000646-05 for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEcj-0007lP-TR for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEci-00063w-OR for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:56:25 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEci-00063s-M2 for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:56:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56443) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1XGEci-00005B-DP for bug-emacs@gnu.org; Sat, 09 Aug 2014 17:56:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEcc-00061V-Dt for bug-emacs@gnu.org; Sat, 09 Aug 2014 17:56:23 -0400 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]:61048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEcc-00061I-5q for bug-emacs@gnu.org; Sat, 09 Aug 2014 17:56:18 -0400 Received: by mail-la0-f52.google.com with SMTP id b17so4508552lan.25 for ; Sat, 09 Aug 2014 14:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:date:message-id:subject:from:to:content-type; bh=0Q9eHuCOv8R4T7vFPdcX1yXMfUjTy1PFI2vopjr92gI=; b=bb/DIL4SvTHngWT4kkcViBdmowsRllj0f4i0ZHN/R+Dyz8yCVvOGrPGt+HndZdY7sL /izO4syY+Wu5ZG/DpJfL4hVjvLWw59JoOuBNZJuJ7fjkQzuuAHesBsG+hA9QZ5gHQUd7 BgAQgnBdoOsEwt9SXpWn4qbU1UQlU8kjKnNoM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=0Q9eHuCOv8R4T7vFPdcX1yXMfUjTy1PFI2vopjr92gI=; b=O3WxrSf/KQDG93jIYPPFS6oruaZyGaWgGJkpu3UOxeBmwui+kOZJ2hACbpvRJgLm5L 6TykG+XhFttYrzs+lwYb6LSnbY26QLE7yyAhpabfIT37po4tpyhs9DW0f3A3jXYi+Pd4 UMsZhvPD96R5a0E7vG88+phpE4A/XN7pBc9kM8JWO6fLJjhtWlutZiVhXc70PJNwKVTV r8FgM3lEieUl6TfmhKdwGmTl2Ztx29HjxDJ3qVPWGDpFcos+NyakPoW+nhT78tw0XSlG p8LeBwIB3kGioEDMAp6DeM4qSPGKgzLH6WEBH8OtuTxH9JoJXvttcoOifGJ2ah5gwBMi l+Qw== X-Gm-Message-State: ALoCoQmleA6i43RnfMtlVOBsjpk556ZJBbaaUDi3wvXPS5UkDANypZ+mU3dQjUd0IWeZacKUUgP+ MIME-Version: 1.0 X-Received: by 10.112.235.199 with SMTP id uo7mr27639035lbc.50.1407621376701; Sat, 09 Aug 2014 14:56:16 -0700 (PDT) Received: by 10.152.246.10 with HTTP; Sat, 9 Aug 2014 14:56:16 -0700 (PDT) Date: Sat, 9 Aug 2014 22:56:16 +0100 Message-ID: From: Reuben Thomas Content-Type: multipart/alternative; boundary=001a11c3c65223120005003964e7 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) --001a11c3c65223120005003964e7 Content-Type: text/plain; charset=UTF-8 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 --001a11c3c65223120005003964e7 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
The following patch is, I believe, necessary and suff= icient to fix some minor breakage recently inadvertently perpetrated on the= MS-DOS build:

=3D=3D=3D modified file 'src/msdos.c'
--- = src/msdos.c=C2=A0=C2=A0=C2=A0 2014-08-09 16:12:33 +0000
+++ src/msdos.c=C2=A0=C2=A0=C2=A0 2014-08-09 21:51:56 +0000
@@ -71,6 +71= ,7 @@
=C2=A0#include "coding.h"
=C2=A0#include "dispta= b.h"
=C2=A0#include "window.h"
+#include "menu.h&= quot;
=C2=A0#include "buffer.h"
=C2=A0#include "commands.h"
=C2=A0#include "blockinput.h&= quot;
=3D=3D=3D modified file 'src/term.c'
--- src/term.c=C2= =A0=C2=A0=C2=A0 2014-07-27 13:21:30 +0000
+++ src/term.c=C2=A0=C2=A0=C2= =A0 2014-08-09 11:15:08 +0000
@@ -3935,7 +3935,11 @@
=C2=A0=C2=A0 terminal->reset_terminal_modes_hook =3D &tty_reset_term= inal_modes;
=C2=A0=C2=A0 terminal->set_terminal_modes_hook =3D &t= ty_set_terminal_modes;
=C2=A0=C2=A0 terminal->update_end_hook =3D &am= p;tty_update_end;
+#ifdef MSDOS
+=C2=A0 terminal->menu_show_hook =3D &x_menu_show;
+#else
=C2= =A0=C2=A0 terminal->menu_show_hook =3D &tty_menu_show;
+#endif=C2=A0=C2=A0 terminal->set_terminal_window_hook =3D &tty_set_termin= al_window;
=C2=A0=C2=A0 terminal->read_socket_hook =3D &tty_read_= avail_input; /* keyboard.c */
=C2=A0=C2=A0 terminal->delete_frame_hook =3D &tty_free_frame_resourc= es;

But until I know my way around the DOS code better I thoug= ht I should get a second opinion.
--001a11c3c65223120005003964e7-- From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 09 18:33:49 2014 Received: (at control) by debbugs.gnu.org; 9 Aug 2014 22:33:50 +0000 Received: from localhost ([127.0.0.1]:36806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGFCv-0007ex-Dr for submit@debbugs.gnu.org; Sat, 09 Aug 2014 18:33:49 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:42764) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGFCt-0007eg-W9 for control@debbugs.gnu.org; Sat, 09 Aug 2014 18:33:48 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id E7FE939E8019 for ; Sat, 9 Aug 2014 15:33:41 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9GSgy9XRbRYn for ; Sat, 9 Aug 2014 15:33:38 -0700 (PDT) Received: from [192.168.1.9] (pool-71-177-17-123.lsanca.dsl-w.verizon.net [71.177.17.123]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 646C439E8012 for ; Sat, 9 Aug 2014 15:33:38 -0700 (PDT) Message-ID: <53E6A1C2.8030201@cs.ucla.edu> Date: Sat, 09 Aug 2014 15:33:38 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: control@debbugs.gnu.org Subject: 18234 has a patch Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) tags 18234 patch From unknown Sat Aug 16 16:13:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18234: Unbreak the DOS build Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 10 Aug 2014 02:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18234 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Reuben Thomas Cc: 18234@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 18234-submit@debbugs.gnu.org id=B18234.140763916331745 (code B ref 18234); Sun, 10 Aug 2014 02:53:02 +0000 Received: (at 18234) by debbugs.gnu.org; 10 Aug 2014 02:52:43 +0000 Received: from localhost ([127.0.0.1]:36912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGJFT-0008Fx-0n for submit@debbugs.gnu.org; Sat, 09 Aug 2014 22:52:43 -0400 Received: from mtaout23.012.net.il ([80.179.55.175]:59676) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGJFP-0008Fg-JF for 18234@debbugs.gnu.org; Sat, 09 Aug 2014 22:52:41 -0400 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NA200300KHNMP00@a-mtaout23.012.net.il> for 18234@debbugs.gnu.org; Sun, 10 Aug 2014 05:52:32 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NA2003VRLBKJ450@a-mtaout23.012.net.il>; Sun, 10 Aug 2014 05:52:32 +0300 (IDT) Date: Sun, 10 Aug 2014 05:52:23 +0300 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <8361i1kqe0.fsf@gnu.org> References: X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Sat, 9 Aug 2014 22:56:16 +0100 > From: Reuben Thomas > > 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. From unknown Sat Aug 16 16:13:28 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Reuben Thomas Subject: bug#18234: closed (Re: bug#18234: Unbreak the DOS build) Message-ID: References: X-Gnu-PR-Message: they-closed 18234 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 18234@debbugs.gnu.org Date: Sun, 10 Aug 2014 16:31:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1407688263-27940-1" This is a multi-part message in MIME format... ------------=_1407688263-27940-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #18234: Unbreak the DOS build which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 18234@debbugs.gnu.org. --=20 18234: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D18234 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1407688263-27940-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 18234-done) by debbugs.gnu.org; 10 Aug 2014 16:30:03 +0000 Received: from localhost ([127.0.0.1]:37873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGW0P-0007E2-Bu for submit@debbugs.gnu.org; Sun, 10 Aug 2014 12:30:02 -0400 Received: from mail-lb0-f169.google.com ([209.85.217.169]:38165) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGW0M-0007Do-Lf for 18234-done@debbugs.gnu.org; Sun, 10 Aug 2014 12:29:59 -0400 Received: by mail-lb0-f169.google.com with SMTP id s7so5179892lbd.14 for <18234-done@debbugs.gnu.org>; Sun, 10 Aug 2014 09:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=H4Klpv2rR3MPaS/zUflT85iVN7MbhJ5Wl6lLh7P8oeU=; b=il2T8DEZQWRrd/2nUqobEG6UyUiJVRq+eUipwiTmqC9MJhjpRbI5SvNvwQcI41j8+i eK0tHTL5KhMbi3781jXT17FX7cQK3cwFO1hHpTz4rdt57mpVFS3MoDMX2jiuqu4NfrbK pAOW7EEChSdeDjyONfLfBLYC4g0jQ/1phbRyc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=H4Klpv2rR3MPaS/zUflT85iVN7MbhJ5Wl6lLh7P8oeU=; b=g3M9kiWLUajwsbDTo7ZwV4OWL0VVwhsMLxBvyASL3KifVJlRDdkE4vaJJrwaDjfPzw BWl0Cj7aJA7SQZbqNwkIQrXEbgAL5j186ktWFTRuNBx7IEUwNEVCSC5Sw1ATqUA/eo1T WHcipfZkCGN9v9AD4F6ub7vluJcvlfUV5UcJZSQl3EbVLAwguww+U2iOUUkdTs7tSqmc MpKOmLZ1aGJkGb+bL3M1BCD8j/92cWmPEZgz8RRaC9ZY8uRe7iroTigy3J3vlEDWFRpS PkwySonsUjjxAXRz9UrSHaOofTPuHezK/bCaHAri2hS03Qs5zSQy2KUJPViYAjkLNuJ4 HHIA== X-Gm-Message-State: ALoCoQn87SXlnEdu7nyt/e81fU1tmsRXLRKFFEoUUhLy+xp+XPFqysBwSjSGB9YEO8oD5EcRX1Bl MIME-Version: 1.0 X-Received: by 10.112.56.148 with SMTP id a20mr3482485lbq.72.1407688192460; Sun, 10 Aug 2014 09:29:52 -0700 (PDT) Received: by 10.152.246.10 with HTTP; Sun, 10 Aug 2014 09:29:52 -0700 (PDT) In-Reply-To: <8361i1kqe0.fsf@gnu.org> References: <8361i1kqe0.fsf@gnu.org> Date: Sun, 10 Aug 2014 17:29:52 +0100 Message-ID: Subject: Re: bug#18234: Unbreak the DOS build From: Reuben Thomas To: Eli Zaretskii Content-Type: multipart/alternative; boundary=001a113393c8aa9e6e050048f23b X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 18234-done Cc: 18234-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --001a113393c8aa9e6e050048f23b Content-Type: text/plain; charset=UTF-8 On 10 August 2014 03:52, Eli Zaretskii wrote: > > Date: Sat, 9 Aug 2014 22:56:16 +0100 > > From: Reuben Thomas > > > > 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 --001a113393c8aa9e6e050048f23b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable --001a113393c8aa9e6e050048f23b-- ------------=_1407688263-27940-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 9 Aug 2014 21:56:37 +0000 Received: from localhost ([127.0.0.1]:36789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGEcu-0006hT-6i for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58804) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XGEcr-0006hF-BX for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEcl-00064A-2l for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,HTML_MESSAGE, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEcl-000646-05 for submit@debbugs.gnu.org; Sat, 09 Aug 2014 17:56:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEcj-0007lP-TR for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEci-00063w-OR for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:56:25 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEci-00063s-M2 for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:56:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56443) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1XGEci-00005B-DP for bug-emacs@gnu.org; Sat, 09 Aug 2014 17:56:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEcc-00061V-Dt for bug-emacs@gnu.org; Sat, 09 Aug 2014 17:56:23 -0400 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]:61048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEcc-00061I-5q for bug-emacs@gnu.org; Sat, 09 Aug 2014 17:56:18 -0400 Received: by mail-la0-f52.google.com with SMTP id b17so4508552lan.25 for ; Sat, 09 Aug 2014 14:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:date:message-id:subject:from:to:content-type; bh=0Q9eHuCOv8R4T7vFPdcX1yXMfUjTy1PFI2vopjr92gI=; b=bb/DIL4SvTHngWT4kkcViBdmowsRllj0f4i0ZHN/R+Dyz8yCVvOGrPGt+HndZdY7sL /izO4syY+Wu5ZG/DpJfL4hVjvLWw59JoOuBNZJuJ7fjkQzuuAHesBsG+hA9QZ5gHQUd7 BgAQgnBdoOsEwt9SXpWn4qbU1UQlU8kjKnNoM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=0Q9eHuCOv8R4T7vFPdcX1yXMfUjTy1PFI2vopjr92gI=; b=O3WxrSf/KQDG93jIYPPFS6oruaZyGaWgGJkpu3UOxeBmwui+kOZJ2hACbpvRJgLm5L 6TykG+XhFttYrzs+lwYb6LSnbY26QLE7yyAhpabfIT37po4tpyhs9DW0f3A3jXYi+Pd4 UMsZhvPD96R5a0E7vG88+phpE4A/XN7pBc9kM8JWO6fLJjhtWlutZiVhXc70PJNwKVTV r8FgM3lEieUl6TfmhKdwGmTl2Ztx29HjxDJ3qVPWGDpFcos+NyakPoW+nhT78tw0XSlG p8LeBwIB3kGioEDMAp6DeM4qSPGKgzLH6WEBH8OtuTxH9JoJXvttcoOifGJ2ah5gwBMi l+Qw== X-Gm-Message-State: ALoCoQmleA6i43RnfMtlVOBsjpk556ZJBbaaUDi3wvXPS5UkDANypZ+mU3dQjUd0IWeZacKUUgP+ MIME-Version: 1.0 X-Received: by 10.112.235.199 with SMTP id uo7mr27639035lbc.50.1407621376701; Sat, 09 Aug 2014 14:56:16 -0700 (PDT) Received: by 10.152.246.10 with HTTP; Sat, 9 Aug 2014 14:56:16 -0700 (PDT) Date: Sat, 9 Aug 2014 22:56:16 +0100 Message-ID: Subject: Unbreak the DOS build From: Reuben Thomas To: bug-emacs Content-Type: multipart/alternative; boundary=001a11c3c65223120005003964e7 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) --001a11c3c65223120005003964e7 Content-Type: text/plain; charset=UTF-8 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 --001a11c3c65223120005003964e7 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
The following patch is, I believe, necessary and suff= icient to fix some minor breakage recently inadvertently perpetrated on the= MS-DOS build:

=3D=3D=3D modified file 'src/msdos.c'
--- = src/msdos.c=C2=A0=C2=A0=C2=A0 2014-08-09 16:12:33 +0000
+++ src/msdos.c=C2=A0=C2=A0=C2=A0 2014-08-09 21:51:56 +0000
@@ -71,6 +71= ,7 @@
=C2=A0#include "coding.h"
=C2=A0#include "dispta= b.h"
=C2=A0#include "window.h"
+#include "menu.h&= quot;
=C2=A0#include "buffer.h"
=C2=A0#include "commands.h"
=C2=A0#include "blockinput.h&= quot;
=3D=3D=3D modified file 'src/term.c'
--- src/term.c=C2= =A0=C2=A0=C2=A0 2014-07-27 13:21:30 +0000
+++ src/term.c=C2=A0=C2=A0=C2= =A0 2014-08-09 11:15:08 +0000
@@ -3935,7 +3935,11 @@
=C2=A0=C2=A0 terminal->reset_terminal_modes_hook =3D &tty_reset_term= inal_modes;
=C2=A0=C2=A0 terminal->set_terminal_modes_hook =3D &t= ty_set_terminal_modes;
=C2=A0=C2=A0 terminal->update_end_hook =3D &am= p;tty_update_end;
+#ifdef MSDOS
+=C2=A0 terminal->menu_show_hook =3D &x_menu_show;
+#else
=C2= =A0=C2=A0 terminal->menu_show_hook =3D &tty_menu_show;
+#endif=C2=A0=C2=A0 terminal->set_terminal_window_hook =3D &tty_set_termin= al_window;
=C2=A0=C2=A0 terminal->read_socket_hook =3D &tty_read_= avail_input; /* keyboard.c */
=C2=A0=C2=A0 terminal->delete_frame_hook =3D &tty_free_frame_resourc= es;

But until I know my way around the DOS code better I thoug= ht I should get a second opinion.
--001a11c3c65223120005003964e7-- ------------=_1407688263-27940-1--