# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 1033828731 0
# Node ID 9feda646c3779cfd1fea2d2c6ad23425712147f4
# Parent  ab07a01e1a9449dbdf263235a9645cc657519f63
(x_window, x_window): Use use_xim.

diff -r ab07a01e1a94 -r 9feda646c377 src/xfns.c
--- a/src/xfns.c	Sat Oct 05 14:37:43 2002 +0000
+++ b/src/xfns.c	Sat Oct 05 14:38:51 2002 +0000
@@ -3431,7 +3431,7 @@
 static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *));
 
 
-/* Supported XIM styles, ordered by preferenc.  */
+/* Supported XIM styles, ordered by preference.  */
 
 static XIMStyle supported_xim_styles[] =
 {
@@ -3887,9 +3887,8 @@
 
 #ifdef HAVE_X_I18N
   FRAME_XIC (f) = NULL;
-#ifdef USE_XIM
-  create_frame_xic (f);
-#endif
+  if (use_xim)
+    create_frame_xic (f);
 #endif
 
   f->output_data.x->wm_hints.input = True;
@@ -3992,19 +3991,20 @@
 		     attribute_mask, &attributes);
 
 #ifdef HAVE_X_I18N
-#ifdef USE_XIM
-  create_frame_xic (f);
-  if (FRAME_XIC (f))
-    {
-      /* XIM server might require some X events. */
-      unsigned long fevent = NoEventMask;
-      XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
-      attributes.event_mask |= fevent;
-      attribute_mask = CWEventMask;
-      XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-			       attribute_mask, &attributes);
-    }
-#endif
+  if use_xim
+    {
+      create_frame_xic (f);
+      if (FRAME_XIC (f))
+	{
+	  /* XIM server might require some X events. */
+	  unsigned long fevent = NoEventMask;
+	  XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
+	  attributes.event_mask |= fevent;
+	  attribute_mask = CWEventMask;
+	  XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+				   attribute_mask, &attributes);
+	}
+    }
 #endif /* HAVE_X_I18N */
   
   validate_x_resource_name ();