(xim_initialize): Use XRegisterIMInstantiateCallback_arg6.

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);