Mercurial > emacs

changeset 59725:a8fd332cc484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_error_quitter): No longer static, and moved after x_error_handler.
author Richard M. Stallman <rms@gnu.org>
date Tue, 25 Jan 2005 01:26:57 +0000
parents e863de92f089
children 25d02ab709fc
files src/xterm.c
diffstat 1 files changed, 19 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Tue Jan 25 00:38:46 2005 +0000
+++ b/src/xterm.c	Tue Jan 25 01:26:57 2005 +0000
@@ -7766,12 +7766,30 @@
   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 @@
 }
 
 
-/* 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.  */