(HAVE_X_I18N) [HAVE_X11R6]: Moved to config.in.

diff --git a/src/ChangeLog b/src/ChangeLog
index 808adc921aff90375f3685ba815c8a84bb1ce312..5a609b263eeb2765e29c68dd92b292035c92e135 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,23 @@
 2000-03-14  Gerd Moellmann  <gerd@gnu.org>
 
+       * lisp.h (free_frame_xic) [HAVE_X_I18N]: Add missing semicolon.
+
+       * xterm.c (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.
+
+       * s/sol2.h (INHIBIT_X11R6_XIM): Define.
+
+       * xfns.c (X_I18N_INHIBITED): Don't define.
+       (create_frame_xic): Remove conditional compilation on
+       X_I18N_INHIBITED.
+       (x_kill_gs_process, x_window): Use FRAME_X_VISUAL.
+
+       * config.in (HAVE_X_I18N): Moved here from xterm.h.
+       (HAVE_X11R6_XIM): Define.
+
+       * xterm.h (HAVE_X_I18N) [HAVE_X11R6]: Moved to config.in.
+
        * xterm.c (x_term_init): Add support for X resource `synchronous'.
        If set, call XSynchronize.
 

diff --git a/src/xterm.h b/src/xterm.h
index c93ba8f979f9d5f79c7b3bcf90586ba2fc105bad..6916b7b031ab83a2b14e4245c3fb5c9126c4875e 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -77,8 +77,7 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_X11R4
 #endif
 
-#ifdef HAVE_X11R5
-#define HAVE_X_I18N
+#ifdef HAVE_X_I18N
 #include <X11/Xlocale.h>
 #endif
 \f