Mercurial > emacs
changeset 28142:156c32f18198
(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.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 14 Mar 2000 21:15:46 +0000 |
| parents | 52b185e0d8bd |
| children | 210942d0dc07 |
| files | src/xterm.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Tue Mar 14 21:15:03 2000 +0000 +++ b/src/xterm.c Tue Mar 14 21:15:46 2000 +0000 @@ -11039,7 +11039,7 @@ } -#ifdef HAVE_X11R6 +#ifdef HAVE_X11R6_XIM struct xim_inst_t { @@ -11096,7 +11096,7 @@ } } -#endif /* HAVE_X11R6 */ +#endif /* HAVE_X11R6_XIM */ /* Open a connection to the XIM server on display DPYINFO. @@ -11109,7 +11109,7 @@ struct x_display_info *dpyinfo; char *resource_name; { -#ifdef HAVE_X11R6 +#ifdef HAVE_X11R6_XIM struct xim_inst_t *xim_inst; int len; @@ -11123,10 +11123,10 @@ resource_name, EMACS_CLASS, xim_instantiate_callback, (XPointer)xim_inst); -#else /* not HAVE_X11R6 */ +#else /* not HAVE_X11R6_XIM */ dpyinfo->xim = NULL; xim_open_dpy (dpyinfo, resource_name); -#endif /* not HAVE_X11R6 */ +#endif /* not HAVE_X11R6_XIM */ } @@ -11136,17 +11136,17 @@ xim_close_dpy (dpyinfo) struct x_display_info *dpyinfo; { -#ifdef HAVE_X11R6 +#ifdef HAVE_X11R6_XIM XUnregisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb, NULL, EMACS_CLASS, xim_instantiate_callback, NULL); -#endif /* HAVE_X11R6 */ +#endif /* not HAVE_X11R6_XIM */ XCloseIM (dpyinfo->xim); dpyinfo->xim = NULL; XFree (dpyinfo->xim_styles); } -#endif /* HAVE_X_I18N */ +#endif /* not HAVE_X11R6_XIM */