xterm.c in CVS will not compile [PATCH]

[Gary Lawrence Murphy <garym@teledyn.com>]

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 <garym@teledyn.com> ==============================
www.teledyn.com - blog.teledyn.com - irish.teledyn.com - sbp.teledyn.com
====================== The present moment is a powerful goddess (Goethe)