[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102173: * src/xterm.c (x_connection_
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102173: * src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe. |
Date: |
Sun, 31 Oct 2010 15:35:44 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102173
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 15:35:44 -0700
message:
* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
modified:
src/ChangeLog
src/xterm.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-10-31 18:26:54 +0000
+++ b/src/ChangeLog 2010-10-31 22:35:44 +0000
@@ -1,5 +1,7 @@
2010-10-31 Glenn Morris <address@hidden>
+ * 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)
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2010-10-31 14:40:01 +0000
+++ b/src/xterm.c 2010-10-31 22:35:44 +0000
@@ -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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102173: * src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.,
Glenn Morris <=