diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-01-25 01:26:57 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-01-25 01:26:57 +0000 |
| commit | b70001a19220e31e26379ffea49f77270ad25904 (patch) | |
| tree | 101cd8143bf52218e413d7d17e04d2e45b29ad5b /src/xterm.c | |
| parent | 2fc3738c631acb7016ddd98a81a6b11e6edb3405 (diff) | |
| download | emacs-b70001a19220e31e26379ffea49f77270ad25904.tar.gz | |
(x_error_quitter): No longer static, and moved after x_error_handler.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 35 |
1 files changed, 19 insertions, 16 deletions
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. */ |