mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-06 11:55:48 +00:00
Code Issues Releases Activity

(X_I18N_INHIBITED): New macro--define this

Browse Source 
instead of undefining HAVE_X_I18N.
(x_window) [HAVE_X_I18N]: Set FRAME_XIM.
[X_I18N_INHIBITED]: Set FRAME_XIM and FRAME_XIC to 0.
This commit is contained in:
Richard M. Stallman 1996-03-18 03:26:17 +00:00
parent 31f41dafa6
commit 32e2bcb882
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/xfns.c
View File

@ -44,7 +44,7 @@ extern void abort ();
/* On some systems, the character-composition stuff is broken in X11R5. */
#if defined (HAVE_X11R5) && ! defined (HAVE_X11R6)
#ifdef X11R5_INHIBIT_I18N
#undef HAVE_X_I18N
#define X_I18N_INHIBITED
#endif
#endif
@ -2656,6 +2656,7 @@ x_window (f, window_prompting, minibuffer_only)
XSetClassHint (FRAME_X_DISPLAY (f), XtWindow (shell_widget), &class_hints);
#ifdef HAVE_X_I18N
#ifndef X_I18N_INHIBITED
{
XIM xim;
XIC xic = NULL;
@ -2671,11 +2672,19 @@ x_window (f, window_prompting, minibuffer_only)
NULL);
if (xic == 0)
XCloseIM (xim);
{
XCloseIM (xim);
xim = NULL;
}
}
FRAME_XIM (f) = xim;
FRAME_XIC (f) = xic;
}
#endif
#else /* X_I18N_INHIBITED */
FRAME_XIM (f) = 0;
FRAME_XIC (f) = 0;
#endif /* X_I18N_INHIBITED */
#endif /* HAVE_X_I18N */
f->output_data.x->wm_hints.input = True;
f->output_data.x->wm_hints.flags |= InputHint;
@ -2769,6 +2778,7 @@ x_window (f)
FRAME_X_DISPLAY_INFO (f)->visual,
attribute_mask, &attributes);
#ifdef HAVE_X_I18N
#ifndef X_I18N_INHIBITED
{
XIM xim;
XIC xic = NULL;
@ -2784,12 +2794,20 @@ x_window (f)
NULL);
if (!xic)
XCloseIM (xim);
{
XCloseIM (xim);
xim = NULL;
}
}
FRAME_XIM (f) = xim;
FRAME_XIC (f) = xic;
}
#endif
#else /* X_I18N_INHIBITED */
FRAME_XIM (f) = 0;
FRAME_XIC (f) = 0;
#endif /* X_I18N_INHIBITED */
#endif /* HAVE_X_I18N */
validate_x_resource_name ();