From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 5 Apr 1996 16:03:20 +0000 (+0000)
Subject: (x_destroy_window): Do call XCloseIM if X11R6.
X-Git-Tag: emacs-19.34~918
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=408be6610bcbce87bc541a069b1c8c64b602080d;p=emacs.git

(x_destroy_window): Do call XCloseIM if X11R6.
---

diff --git a/src/xterm.c b/src/xterm.c
index c6aede5150f..99249f7ca4b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5558,9 +5558,10 @@ x_destroy_window (f)
       if (FRAME_XIM (f))
 	{
 	  XDestroyIC (FRAME_XIC (f));
-#ifndef SOLARIS2 /* This code causes crashes on Solaris 2.3 and 2.5,
-		    due to an apparent bug in XCloseIM.
-		    The bug may be only in Openwin and not in X11R6.  */
+#if ! defined (SOLARIS2) || defined (HAVE_X11R6)
+	  /* This line causes crashes on Solaris with Openwin,
+	     due to an apparent bug in XCloseIM.
+	     X11R6 seems not to have the bug.  */
 	  XCloseIM (FRAME_XIM (f));
 #endif
 	}