* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.

80696982 · Glenn Morris · 389b76fa · 80696982 · 80696982
Commit 80696982 authored Oct 31, 2010 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/xterm.c src/xterm.c +0 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2010-10-31  Glenn Morris  <rgm@gnu.org>

+	* xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
+
 	* frame.c (syms_of_frame) <tool-bar-mode>:
 	Default to nil if !HAVE_WINDOW_SYSTEM.  (Bug#7299)


--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7689,7 +7689,6 @@ x_connection_closed (Display *dpy, const char *error_message)
 	 Closing the display is reported to lead to a bus error on
 	 OpenWindows in certain situations.  I suspect that is a bug
 	 in OpenWindows.  I don't know how to circumvent it here.  */
-      extern void (*fatal_error_signal_hook) P_ ((void));
      fatal_error_signal_hook = x_fatal_error_signal;
      XtCloseDisplay (dpy);
      fatal_error_signal_hook = NULL;