[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c,v |
Date: |
Tue, 04 Nov 2008 16:47:35 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/11/04 16:47:35
Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1009
retrieving revision 1.1010
diff -u -b -r1.1009 -r1.1010
--- xterm.c 27 Oct 2008 22:20:46 -0000 1.1009
+++ xterm.c 4 Nov 2008 16:47:34 -0000 1.1010
@@ -8319,9 +8319,11 @@
XUnregisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb,
NULL, EMACS_CLASS,
xim_instantiate_callback, NULL);
-#endif /* not HAVE_X11R6_XIM */
+#else /* not HAVE_X11R6_XIM */
+ /* If we have X11R6 xim, this causes a double-free. */
if (dpyinfo->display)
XCloseIM (dpyinfo->xim);
+#endif /* HAVE_X11R6_XIM */
dpyinfo->xim = NULL;
XFree (dpyinfo->xim_styles);
}
- [Emacs-diffs] Changes to emacs/src/xterm.c,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/src/xterm.c,v, Glenn Morris, 2008/11/05
- [Emacs-diffs] Changes to emacs/src/xterm.c,v, Chong Yidong, 2008/11/12
- [Emacs-diffs] Changes to emacs/src/xterm.c,v, Chong Yidong, 2008/11/15
- [Emacs-diffs] Changes to emacs/src/xterm.c,v, Chong Yidong, 2008/11/15