Mercurial > emacs
changeset 28144:71ebba3566ec
(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.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 14 Mar 2000 21:16:36 +0000 |
| parents | 210942d0dc07 |
| children | 1426e80e9ba8 |
| files | src/xfns.c |
| diffstat | 1 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Tue Mar 14 21:16:04 2000 +0000 +++ b/src/xfns.c Tue Mar 14 21:16:36 2000 +0000 @@ -50,14 +50,6 @@ #include <sys/types.h> #include <sys/stat.h> -/* On some systems, the character-composition stuff is broken in X11R5. */ - -#if defined (HAVE_X11R5) && ! defined (HAVE_X11R6) -#ifdef X11R5_INHIBIT_I18N -#define X_I18N_INHIBITED -#endif -#endif - #ifndef VMS #if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */ #include "bitmaps/gray.xbm" @@ -3075,7 +3067,6 @@ create_frame_xic (f) struct frame *f; { -#ifndef X_I18N_INHIBITED XIM xim; XIC xic = NULL; XFontSet xfs = NULL; @@ -3168,11 +3159,6 @@ FRAME_XIC (f) = xic; FRAME_XIC_STYLE (f) = xic_style; FRAME_XIC_FONTSET (f) = xfs; -#else /* X_I18N_INHIBITED */ - FRAME_XIC (f) = NULL; - FRAME_XIC_STYLE (f) = 0; - FRAME_XIC_FONTSET (f) = NULL; -#endif /* X_I18N_INHIBITED */ } @@ -3551,7 +3537,7 @@ f->output_data.x->border_width, CopyFromParent, /* depth */ InputOutput, /* class */ - FRAME_X_DISPLAY_INFO (f)->visual, + FRAME_X_VISUAL (f), attribute_mask, &attributes); #ifdef HAVE_X_I18N @@ -9053,7 +9039,7 @@ /* On displays with a mutable colormap, figure out the colors allocated for the image by looking at the pixels of an XImage for img->pixmap. */ - class = FRAME_X_DISPLAY_INFO (f)->visual->class; + class = FRAME_X_VISUAL (f)->class; if (class != StaticColor && class != StaticGray && class != TrueColor) { XImage *ximg;