[Emacs-diffs] Changes to emacs/src/xterm.c

[Richard M . Stallman]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.856 emacs/src/xterm.c:1.857
*** emacs/src/xterm.c:1.856     Thu Jan 20 15:23:22 2005
--- emacs/src/xterm.c   Tue Jan 25 01:26:57 2005
***************
*** 7766,7777 ****
    error ("%s", error_msg);
  }
  
  
  /* 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
  x_error_quitter (display, error)
       Display *display;
       XErrorEvent *error;
--- 7766,7795 ----
    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.  */
  
! /* 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,7808 ****
  }
  
  
- /* 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.  */
--- 7806,7811 ----