(xim_initialize): Use XRegisterIMInstantiateCallback_arg6.

diff --git a/src/ChangeLog b/src/ChangeLog
index a3eca94a416df640d05d0f4ce1f40b0ad226a720..e13d55bbb696ee935510713eefc31a754c133897 100644 (file)
--- 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 f4f411aa5dffdc6dcbf9d7f384c7a94accafee3f..a947fb03e63fbbfbebbf017c3bf6066179ff784a 100644 (file)
--- 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);