From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 25 Jan 2005 01:26:57 +0000 (+0000)
Subject: (x_error_quitter): No longer static, and moved after x_error_handler.
X-Git-Tag: ttn-vms-21-2-B4~2594
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b70001a19220e31e26379ffea49f77270ad25904;p=emacs.git

(x_error_quitter): No longer static, and moved after x_error_handler.
---

diff --git a/src/xterm.c b/src/xterm.c
index 3e54a46c714..63783de4f4f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7766,12 +7766,30 @@ x_connection_closed (dpy, error_message)
   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.  */
 
-static void
+/* This is not static because we want to put a breakpoint on it.
+   It is after x_error_handler so that it won't get inlined in
+   x_error_handler.  */
+
+void
 x_error_quitter (display, error)
      Display *display;
      XErrorEvent *error;
@@ -7788,21 +7806,6 @@ x_error_quitter (display, error)
 }
 
 
-/* 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.  */