From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reuben Thomas Newsgroups: gmane.emacs.bugs Subject: bug#18234: Unbreak the DOS build Date: Sat, 9 Aug 2014 22:56:16 +0100 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c3c65223120005003964e7 X-Trace: ger.gmane.org 1407621443 13891 80.91.229.3 (9 Aug 2014 21:57:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Aug 2014 21:57:23 +0000 (UTC) To: 18234@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 09 23:57:12 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XGEdR-0000OV-RR for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Aug 2014 23:57:10 +0200 Original-Received: from localhost ([::1]:57485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEdR-0007mf-BS for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Aug 2014 17:57:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEdL-0007mX-KY for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:57:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGEdK-00067W-9A for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:57:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58079) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGEdK-00067S-6E for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:57:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XGEdJ-0006iA-Rc for bug-gnu-emacs@gnu.org; Sat, 09 Aug 2014 17:57:01 -0400 X-Loop: help-debbugs@gnu.org 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: X-Debbugs-Original-To: bug-emacs Original-Received: via spool by submit@debbugs.gnu.org id=B.140762139725764 (code B ref -1); Sat, 09 Aug 2014 21:57:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 9 Aug 2014 21:56:37 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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+ X-Received: by 10.112.235.199 with SMTP id uo7mr27639035lbc.50.1407621376701; Sat, 09 Aug 2014 14:56:16 -0700 (PDT) Original-Received: by 10.152.246.10 with HTTP; Sat, 9 Aug 2014 14:56:16 -0700 (PDT) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:92354 Archived-At: --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--