1 files changed, 2 insertions, 3 deletions

diff --git a/src/keymap.c b/src/keymap.c
index d1ddd55a358..82c9e980221 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -565,15 +565,14 @@ map_keymap_char_table_item (Lisp_Object args, Lisp_Object key, Lisp_Object val)
 {
   if (!NILP (val))
     {
-      map_keymap_function_t fun
-        = (map_keymap_function_t) XSAVE_VALUE (XCAR (args))->pointer;
+      map_keymap_function_t fun = XSAVE_POINTER (XCAR (args));
       args = XCDR (args);
       /* If the key is a range, make a copy since map_char_table modifies
          it in place.  */
       if (CONSP (key))
         key = Fcons (XCAR (key), XCDR (key));
       map_keymap_item (fun, XCDR (args), key, val,
-                       XSAVE_VALUE (XCAR (args))->pointer);
+                       XSAVE_POINTER (XCAR (args)));
     }
 }