From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Gary Lawrence Murphy Newsgroups: gmane.emacs.bugs Subject: xterm.c in CVS will not compile [PATCH] Date: Thu, 27 Jan 2005 10:09:18 -0500 Organization: teledynamics communications inc (teledyn.com) Message-ID: Reply-To: Gary Lawrence Murphy NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1106839191 12833 80.91.229.6 (27 Jan 2005 15:19:51 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 27 Jan 2005 15:19:51 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jan 27 16:19:42 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CuBQs-0007lq-00 for ; Thu, 27 Jan 2005 16:19:42 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CuBdE-0002bp-Vn for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Jan 2005 10:32:29 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1CuBZs-0001EC-KL for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2005 10:29:08 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1CuBZj-00018G-Bv for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2005 10:28:51 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CuBZi-00016J-G6 for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2005 10:28:50 -0500 Original-Received: from [207.61.5.143] (helo=maya.dyndns.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CuBGs-0004UV-SW for bug-gnu-emacs@gnu.org; Thu, 27 Jan 2005 10:09:49 -0500 Original-Received: by maya.dyndns.org (Postfix, from userid 501) id E8B921B603; Thu, 27 Jan 2005 10:09:18 -0500 (EST) Original-To: bug-gnu-emacs@gnu.org X-Face: =5x+:Y0B9+Rxqq>~4fy; "j_'={?([Yp7<09D7{; |jF?{'T^">e&m, List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.bugs:10608 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:10608 This bug report will be sent to the Free Software Foundation, not to your local site managers! Please write in English, because the Emacs maintainers do not have translators to read other languages for them. Your bug report will be posted to the bug-gnu-emacs@gnu.org mailing list, and to the gnu.emacs.bug news group. In GNU Emacs 21.3.2 (i386-mandrake-linux-gnu, X toolkit, Xaw3d scroll bars) of 2004-08-20 on n4.mandrakesoft.com, modified by Mandrake configured using `configure --prefix=/usr --libexecdir=/usr/lib --sharedstatedir=/var --with-gcc --with-pop --mandir=/usr/share/man --infodir=/usr/share/info --with-x-toolkit i386-mandrake-linux --libdir=/usr/lib' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: en value of $LC_CTYPE: en_CA value of $LC_MESSAGES: en_CA value of $LC_MONETARY: en_CA value of $LC_NUMERIC: en_CA value of $LC_TIME: en_CA value of $LANG: en_CA locale-coding-system: iso-latin-1 default-enable-multibyte-characters: t Please describe exactly what actions triggered the bug and the precise symptoms of the bug: there is a wrong ordering of definitions in src/xterm.c that prevents emacs from compiling -- the earlier invocation of the function is taken as the prototype so the later definition of the function is said to have wrong parameter types. here's the patch: Index: src/xterm.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/xterm.c,v retrieving revision 1.857 diff -u -r1.857 xterm.c --- src/xterm.c 25 Jan 2005 01:26:57 -0000 1.857 +++ src/xterm.c 27 Jan 2005 15:07:22 -0000 @@ -7766,21 +7766,6 @@ error ("%s", error_msg); } -/* This is the first-level handler for X protocol errors. - It calls x_error_quitter or x_error_catcher. */ - -static int -x_error_handler (display, error) - Display *display; - XErrorEvent *error; -{ - if (! NILP (x_error_message_string)) - x_error_catcher (display, error); - else - x_error_quitter (display, error); - return 0; -} - /* This is the usual handler for X protocol errors. It kills all frames on the display that we got the error for. If that was the only one, it prints an error message and kills Emacs. */ @@ -7806,6 +7791,21 @@ } +/* This is the first-level handler for X protocol errors. + It calls x_error_quitter or x_error_catcher. */ + +static int +x_error_handler (display, error) + Display *display; + XErrorEvent *error; +{ + if (! NILP (x_error_message_string)) + x_error_catcher (display, error); + else + x_error_quitter (display, error); + return 0; +} + /* This is the handler for X IO errors, always. It kills all frames on the display that we lost touch with. If that was the only one, it prints an error message and kills Emacs. */ -- Gary Lawrence Murphy ============================== www.teledyn.com - blog.teledyn.com - irish.teledyn.com - sbp.teledyn.com ====================== The present moment is a powerful goddess (Goethe)