From: Glenn Morris <rgm@gnu.org>
Date: Sun, 31 Oct 2010 22:35:44 +0000 (-0700)
Subject: * src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~422^2~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8069698297f1d4c65ca6da70e6949b92b5b678d4;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 15da02b3e3d..00bd97ae29e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 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)
 
diff --git a/src/xterm.c b/src/xterm.c
index c7f7d036f9f..07388970640 100644
--- 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;