Mercurial > emacs
changeset 111270:83641cd010c7
* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 31 Oct 2010 15:35:44 -0700 |
| parents | 3d7a1caabf14 |
| children | 61073c29d954 |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Oct 31 22:31:24 2010 +0000 +++ b/src/ChangeLog Sun Oct 31 15:35:44 2010 -0700 @@ -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)
--- a/src/xterm.c Sun Oct 31 22:31:24 2010 +0000 +++ b/src/xterm.c Sun Oct 31 15:35:44 2010 -0700 @@ -7689,7 +7689,6 @@ 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;