[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src xterm.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src xterm.c |
Date: |
Sat, 13 Dec 2008 22:09:10 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/12/13 22:09:10
Modified files:
src : xterm.c
Log message:
(x_delete_display): Move xim_close_dpy call to x_delete_terminal.
(x_delete_terminal): Call xim_close_dpy.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1016&r2=1.1017
Patches:
Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1016
retrieving revision 1.1017
diff -u -b -r1.1016 -r1.1017
--- xterm.c 13 Dec 2008 05:44:38 -0000 1.1016
+++ xterm.c 13 Dec 2008 22:09:09 -0000 1.1017
@@ -10524,10 +10524,6 @@
XrmDestroyDatabase (dpyinfo->xrdb);
#endif
#endif
-#ifdef HAVE_X_I18N
- if (dpyinfo->xim)
- xim_close_dpy (dpyinfo);
-#endif
xfree (dpyinfo->x_id_name);
xfree (dpyinfo->x_dnd_atoms);
@@ -10635,6 +10631,13 @@
return;
BLOCK_INPUT;
+#ifdef HAVE_X_I18N
+ /* We must close our connection to the XIM server before closing the
+ X display. */
+ if (dpyinfo->xim)
+ xim_close_dpy (dpyinfo);
+#endif
+
/* If called from x_connection_closed, the display may already be closed
and dpyinfo->display was set to 0 to indicate that. */
if (dpyinfo->display)