/[emacs]/emacs/src/xterm.c
ViewVC logotype

Diff of /emacs/src/xterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.856 by kfstorm, Thu Jan 20 15:23:22 2005 UTC revision 1.857 by rms, Tue Jan 25 01:26:57 2005 UTC
# Line 7766  x_connection_closed (dpy, error_message) Line 7766  x_connection_closed (dpy, error_message)
7766    error ("%s", error_msg);    error ("%s", error_msg);
7767  }  }
7768    
7769    /* This is the first-level handler for X protocol errors.
7770       It calls x_error_quitter or x_error_catcher.  */
7771    
7772    static int
7773    x_error_handler (display, error)
7774         Display *display;
7775         XErrorEvent *error;
7776    {
7777      if (! NILP (x_error_message_string))
7778        x_error_catcher (display, error);
7779      else
7780        x_error_quitter (display, error);
7781      return 0;
7782    }
7783    
7784  /* This is the usual handler for X protocol errors.  /* This is the usual handler for X protocol errors.
7785     It kills all frames on the display that we got the error for.     It kills all frames on the display that we got the error for.
7786     If that was the only one, it prints an error message and kills Emacs.  */     If that was the only one, it prints an error message and kills Emacs.  */
7787    
7788  static void  /* This is not static because we want to put a breakpoint on it.
7789       It is after x_error_handler so that it won't get inlined in
7790       x_error_handler.  */
7791    
7792    void
7793  x_error_quitter (display, error)  x_error_quitter (display, error)
7794       Display *display;       Display *display;
7795       XErrorEvent *error;       XErrorEvent *error;
# Line 7788  x_error_quitter (display, error) Line 7806  x_error_quitter (display, error)
7806  }  }
7807    
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;  
 }  
   
7809  /* This is the handler for X IO errors, always.  /* This is the handler for X IO errors, always.
7810     It kills all frames on the display that we lost touch with.     It kills all frames on the display that we lost touch with.
7811     If that was the only one, it prints an error message and kills Emacs.  */     If that was the only one, it prints an error message and kills Emacs.  */

Legend:
Removed from v.1.856  
changed lines
  Added in v.1.857

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26