(set-display-table-and-terminal-coding-system):

[gnu-emacs] / src / xterm.c

diff --git a/src/xterm.c b/src/xterm.c
index f83b1b7146efec1a6a9deb2ca3528f4926c98289..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.  */
@@ -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;