From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 29 Jul 2003 17:38:21 +0000 (+0000)
Subject: (xim_open_dpy, xim_initialize, xim_close_dpy):
X-Git-Tag: ttn-vms-21-2-B4~9209
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e7ade6ebb298774d2ae3538d5a1494abab94a37;p=emacs.git

(xim_open_dpy, xim_initialize, xim_close_dpy):
Conditionalize XIM code on HAVE_XIM.
---

diff --git a/src/xterm.c b/src/xterm.c
index 92c3317c106..7ffff61f361 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8024,6 +8024,7 @@ xim_open_dpy (dpyinfo, resource_name)
 {
   XIM xim;
 
+#ifdef HAVE_XIM
   if (use_xim)
     {
       xim = XOpenIM (dpyinfo->display, dpyinfo->xrdb, resource_name,
@@ -8048,6 +8049,7 @@ xim_open_dpy (dpyinfo, resource_name)
     }
 
   else
+#endif /* HAVE_XIM */
     dpyinfo->xim = NULL;
 }
 
@@ -8122,6 +8124,7 @@ xim_initialize (dpyinfo, resource_name)
      struct x_display_info *dpyinfo;
      char *resource_name;
 {
+#ifdef HAVE_XIM
   if (use_xim)
     {
 #ifdef HAVE_X11R6_XIM
@@ -8148,6 +8151,7 @@ xim_initialize (dpyinfo, resource_name)
 
     }
   else
+#endif /* HAVE_XIM */
     dpyinfo->xim = NULL;
 }
 
@@ -8158,6 +8162,7 @@ static void
 xim_close_dpy (dpyinfo)
      struct x_display_info *dpyinfo;
 {
+#ifdef HAVE_XIM
   if (use_xim)
     {
 #ifdef HAVE_X11R6_XIM
@@ -8171,6 +8176,7 @@ xim_close_dpy (dpyinfo)
       dpyinfo->xim = NULL;
       XFree (dpyinfo->xim_styles);
     }
+#endif /* HAVE_XIM */
 }
 
 #endif /* not HAVE_X11R6_XIM */