Mercurial > emacs

changeset 97952:2c2adcbee8a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_delete_display): Fix merge error.
author Andreas Schwab <schwab@suse.de>
date Tue, 02 Sep 2008 11:45:08 +0000
parents 12e22cbad134
children 9a4e29eac778
files src/ChangeLog src/xterm.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Sep 02 09:03:10 2008 +0000
+++ b/src/ChangeLog	Tue Sep 02 11:45:08 2008 +0000
@@ -1,5 +1,7 @@
 2008-09-02  Andreas Schwab  <schwab@suse.de>
 
+	* xterm.c (x_delete_display): Fix merge error.
+
 	* fileio.c (Fexpand_file_name): Remove unused variables.
 
 2008-09-02  Eli Zaretskii  <eliz@gnu.org>
--- a/src/xterm.c	Tue Sep 02 09:03:10 2008 +0000
+++ b/src/xterm.c	Tue Sep 02 11:45:08 2008 +0000
@@ -10516,7 +10516,6 @@
   /* Xt and GTK do this themselves.  */
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #ifndef AIX		/* On AIX, XCloseDisplay calls this.  */
-  /* Xt and GTK does this themselves. */
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif
 #endif