Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

1 files changed, 9 insertions, 3 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 536db77f59b..d29d5636e1c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -106,6 +106,12 @@ static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
                              Lisp_Object, Lisp_Object, bool, bool);
 static void silly_event_symbol_error (Lisp_Object);
 static Lisp_Object get_keyelt (Lisp_Object, bool);
+
+static void
+CHECK_VECTOR_OR_CHAR_TABLE (Lisp_Object x)
+{
+  CHECK_TYPE (VECTORP (x) || CHAR_TABLE_P (x), Qvector_or_char_table_p, x);
+}
 
 /* Keymap object support - constructors and predicates.                 */
 
@@ -566,7 +572,7 @@ 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_POINTER (args, 0);
+        = (map_keymap_function_t) XSAVE_FUNCPOINTER (args, 0);
       /* If the key is a range, make a copy since map_char_table modifies
          it in place.  */
       if (CONSP (key))
@@ -611,8 +617,8 @@ map_keymap_internal (Lisp_Object map,
         }
       else if (CHAR_TABLE_P (binding))
         map_char_table (map_keymap_char_table_item, Qnil, binding,
-                        make_save_value (SAVE_TYPE_PTR_PTR_OBJ,
-                                         fun, data, args));
+                        make_save_value (SAVE_TYPE_FUNCPTR_PTR_OBJ,
+                                         (voidfuncptr) fun, data, args));
     }
   UNGCPRO;
   return tail;