(temp_output_buffer_setup): Use new type for overlays_(before|after).

[gnu-emacs] / src / xterm.c

diff --git a/src/xterm.c b/src/xterm.c
index a947fb03e63fbbfbebbf017c3bf6066179ff784a..c8a56dc74429f6df8daa5773ba5ff5785132fcd2 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -159,7 +159,12 @@ extern void _XEditResCheckMessages ();
 #define abs(x) ((x) < 0 ? -(x) : (x))
 
 /* Default to using XIM if available.  */
+#ifdef USE_XIM
 int use_xim = 1;
+#else
+int use_xim = 0;  /* configure --without-xim */
+#endif
+
 \f
 
 /* Non-nil means Emacs uses toolkit scroll bars.  */
@@ -8123,7 +8128,7 @@ xim_initialize (dpyinfo, resource_name)
                                      /* This is XPointer in XFree86
                                         but (XPointer *) on Tru64, at
                                         least, hence the configure test.  */
-                                     (XRegisterIMInstantiateCallback_arg6) xim_inst);
+                                     (XPointer) xim_inst);
 #else /* not HAVE_X11R6_XIM */
       dpyinfo->xim = NULL;
       xim_open_dpy (dpyinfo, resource_name);
@@ -10525,10 +10530,17 @@ x_term_init (display_name, xrm_option, resource_name)
                                    build_string ("useXIM"),
                                    build_string ("UseXIM"),
                                    Qnil, Qnil);
+#ifdef USE_XIM
     if (STRINGP (value)
        && (!strcmp (XSTRING (value)->data, "false")
            || !strcmp (XSTRING (value)->data, "off")))
       use_xim = 0;
+#else
+    if (STRINGP (value)
+       && (!strcmp (XSTRING (value)->data, "true")
+           || !strcmp (XSTRING (value)->data, "on")))
+      use_xim = 1;
+#endif
   }
 
   UNBLOCK_INPUT;