From 9c763cca0be05366841a42a4a31f06726bc5de60 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 14 Mar 2000 21:17:59 +0000 Subject: [PATCH] (HAVE_X_I18N) [HAVE_X11R6]: Moved to config.in. --- src/ChangeLog | 18 ++++++++++++++++++ src/xterm.h | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 808adc921af..5a609b263ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,23 @@ 2000-03-14 Gerd Moellmann + * 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 c93ba8f979f..6916b7b031a 100644 --- 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 #endif -- 2.39.5