1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00

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

This commit is contained in:
Glenn Morris 2010-10-31 15:35:44 -07:00
parent 389b76fa1b
commit 8069698297
2 changed files with 2 additions and 1 deletions

View File

@ -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)

View File

@ -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;