diff options
| author | Dave Love <fx@gnu.org> | 2003-06-24 09:43:04 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2003-06-24 09:43:04 +0000 |
| commit | bcea31c2b6326d6a194a2bf457b2f4f0992779b7 (patch) | |
| tree | 499fa5ebf291c1aa3ef3d6b0ba93d62235255d09 | |
| parent | fcf08f5b7d3c590afc9d02b4e5a24b8b6b96a83b (diff) | |
| download | emacs-bcea31c2b6326d6a194a2bf457b2f4f0992779b7.tar.gz | |
(xim_initialize): Use XRegisterIMInstantiateCallback_arg6.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xterm.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a3eca94a416..e13d55bbb69 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2003-06-24 Dave Love <fx@gnu.org> + + * xterm.c (xim_initialize): Use XRegisterIMInstantiateCallback_arg6. + + * strftime.c: Test HAVE_SYS__MBSTATE_H, not __hpux. Merge changes + from gnulib. + 2003-06-21 Richard M. Stallman <rms@gnu.org> * fileio.c (Fwrite_region): Alternate messages diff --git a/src/xterm.c b/src/xterm.c index f4f411aa5df..a947fb03e63 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8120,10 +8120,10 @@ xim_initialize (dpyinfo, resource_name) XRegisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb, resource_name, EMACS_CLASS, xim_instantiate_callback, - /* Fixme: This is XPointer in - XFree86 but (XPointer *) on - Tru64, at least. */ - (XPointer) xim_inst); + /* This is XPointer in XFree86 + but (XPointer *) on Tru64, at + least, hence the configure test. */ + (XRegisterIMInstantiateCallback_arg6) xim_inst); #else /* not HAVE_X11R6_XIM */ dpyinfo->xim = NULL; xim_open_dpy (dpyinfo, resource_name); |