(xim_close_dpy, xim_initialize): Use X11R6-style XIM

support functions only if HAVE_X11R6_XIM is defined.
(xim_instantiate_callback): Define only if HAVE_X11R6_XIM.

diff --git a/src/xterm.c b/src/xterm.c
index e52e22e4bc153920a1462690210c682fbcd257ff..1f231b37e4d676d1e1857bb30f6f96870af025a7 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11039,7 +11039,7 @@ xim_open_dpy (dpyinfo, resource_name)
 }
 
 
-#ifdef HAVE_X11R6
+#ifdef HAVE_X11R6_XIM
 
 struct xim_inst_t
 {
@@ -11096,7 +11096,7 @@ xim_instantiate_callback (display, client_data, call_data)
     }
 }
 
-#endif /* HAVE_X11R6 */
+#endif /* HAVE_X11R6_XIM */
 
 
 /* Open a connection to the XIM server on display DPYINFO.
@@ -11109,7 +11109,7 @@ xim_initialize (dpyinfo, resource_name)
      struct x_display_info *dpyinfo;
      char *resource_name;
 {
-#ifdef HAVE_X11R6
+#ifdef HAVE_X11R6_XIM
   struct xim_inst_t *xim_inst;
   int len;
   
@@ -11123,10 +11123,10 @@ xim_initialize (dpyinfo, resource_name)
                                  resource_name, EMACS_CLASS,
                                  xim_instantiate_callback,
                                  (XPointer)xim_inst);
-#else /* not HAVE_X11R6 */
+#else /* not HAVE_X11R6_XIM */
   dpyinfo->xim = NULL;
   xim_open_dpy (dpyinfo, resource_name);
-#endif /* not HAVE_X11R6 */
+#endif /* not HAVE_X11R6_XIM */
 }
 
 
@@ -11136,17 +11136,17 @@ static void
 xim_close_dpy (dpyinfo)
      struct x_display_info *dpyinfo;
 {
-#ifdef HAVE_X11R6
+#ifdef HAVE_X11R6_XIM
   XUnregisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb,
                                    NULL, EMACS_CLASS,
                                    xim_instantiate_callback, NULL);
-#endif /* HAVE_X11R6 */
+#endif /* not HAVE_X11R6_XIM */
   XCloseIM (dpyinfo->xim);
   dpyinfo->xim = NULL;
   XFree (dpyinfo->xim_styles);
 }
 
-#endif /* HAVE_X_I18N */
+#endif /* not HAVE_X11R6_XIM */
 
 
 \f