aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-08-21 19:40:29 +0000
committerChong Yidong2008-08-21 19:40:29 +0000
commitbd917d98addbb66b1c2a34563db2111d53dd8408 (patch)
tree3a34052e3d81a3b3c4ee59f8c5de45317da46eb0 /src
parentf47a7c53823bdf25f5a771ec4bbfcf86c725c0c3 (diff)
downloademacs-bd917d98addbb66b1c2a34563db2111d53dd8408.tar.gz
emacs-bd917d98addbb66b1c2a34563db2111d53dd8408.zip
(x_delete_display): Don't call XrmDestroyDatabase on GTK+.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 89cf06c05e0..8dc422b3282 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11034,8 +11034,9 @@ x_delete_display (dpyinfo)
11034 tail->next = tail->next->next; 11034 tail->next = tail->next->next;
11035 } 11035 }
11036 11036
11037#ifndef USE_X_TOOLKIT /* I'm told Xt does this itself. */ 11037#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
11038#ifndef AIX /* On AIX, XCloseDisplay calls this. */ 11038#ifndef AIX /* On AIX, XCloseDisplay calls this. */
11039 /* Xt and GTK does this themselves. */
11039 XrmDestroyDatabase (dpyinfo->xrdb); 11040 XrmDestroyDatabase (dpyinfo->xrdb);
11040#endif 11041#endif
11041#endif 11042#endif