From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#12316: Simplify redefinition of 'abort'. Date: Fri, 31 Aug 2012 17:41:23 +0300 Message-ID: <83zk5bp1ik.fsf@gnu.org> References: <50402C2B.5020800@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1346424178 5172 80.91.229.3 (31 Aug 2012 14:42:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 31 Aug 2012 14:42:58 +0000 (UTC) Cc: lekktu@gmail.com, 12316@debbugs.gnu.org To: Paul Eggert Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 31 16:42:59 2012 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 1T7SR0-00050e-Ph for geb-bug-gnu-emacs@m.gmane.org; Fri, 31 Aug 2012 16:42:58 +0200 Original-Received: from localhost ([::1]:60761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7SQy-0003LH-Cm for geb-bug-gnu-emacs@m.gmane.org; Fri, 31 Aug 2012 10:42:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7SQq-0003Ks-64 for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:42:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7SQo-0008To-Tm for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:42:48 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7SQo-0008Tk-Qy for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:42:46 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1T7SS2-00039H-8O for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:44:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 31 Aug 2012 14:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12316 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-Cc: lekktu@gmail.com, bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.134642419212036 (code B ref -1); Fri, 31 Aug 2012 14:44:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 31 Aug 2012 14:43:12 +0000 Original-Received: from localhost ([127.0.0.1]:59642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7SRE-000385-Ab for submit@debbugs.gnu.org; Fri, 31 Aug 2012 10:43:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38161) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7SRD-00037z-3s for submit@debbugs.gnu.org; Fri, 31 Aug 2012 10:43:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7SPq-0008L6-1r for submit@debbugs.gnu.org; Fri, 31 Aug 2012 10:41:55 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:41943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7SPp-0008L2-Uv for submit@debbugs.gnu.org; Fri, 31 Aug 2012 10:41:45 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7SPo-0003Ec-Nc for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:41:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7SPj-0008KY-Dg for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:41:44 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:61081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7SPi-0008KF-SG for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 10:41:39 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0M9M00K00J904600@a-mtaout21.012.net.il> for bug-gnu-emacs@gnu.org; Fri, 31 Aug 2012 17:41:23 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M9M00K7SJGZ0H30@a-mtaout21.012.net.il>; Fri, 31 Aug 2012 17:41:23 +0300 (IDT) In-reply-to: <50402C2B.5020800@cs.ucla.edu> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:63630 Archived-At: > Date: Thu, 30 Aug 2012 20:14:51 -0700 > From: Paul Eggert > CC: Eli Zaretskii , Juanma Barranquero > > === modified file 'src/msdos.c' > --- src/msdos.c 2012-08-21 10:21:04 +0000 > +++ src/msdos.c 2012-08-31 03:06:13 +0000 > @@ -4215,26 +4215,9 @@ > } > #endif > > -#ifdef abort > -#undef abort > -void > -dos_abort (char *file, int line) > -{ > - char buffer1[200], buffer2[400]; > - int i, j; > - > - sprintf (buffer1, "", file, line); > - for (i = j = 0; buffer1[i]; i++) { > - buffer2[j++] = buffer1[i]; > - buffer2[j++] = 0x70; > - } > - dosmemput (buffer2, j, (int)ScreenPrimary); > - ScreenSetCursor (2, 0); > - abort (); > -} > -#else > -void > -abort (void) > +#ifdef HAVE_NTGUI <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > +void > +emacs_abort (void) > { > dos_ttcooked (); > ScreenSetCursor (10, 0); The line marked above is wrong: code on msdos.c has no relation whatsoever to the Windows build.