Merge from trunk.

[gnu-emacs] / src / keymap.h

diff --git a/src/keymap.h b/src/keymap.h
index 2b9d58b39dcd1baf34d87f7cab2a8d6aa5ed179a..ec9d4cadbb1cfdec36f263343eb06306bf9a7ee1 100644 (file)
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -36,9 +36,9 @@ EXFUN (Fcurrent_active_maps, 2);
 extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int);
 extern Lisp_Object get_keymap (Lisp_Object, int, int);
 EXFUN (Fset_keymap_parent, 2);
-extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
-                               const char *, int, int, int, int);
-extern int current_minor_maps (Lisp_Object **, Lisp_Object **);
+extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
+                             const char *, int, int, int, int);
+extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **);
 extern void initial_define_key (Lisp_Object, int, const char *);
 extern void initial_define_lispy_key (Lisp_Object, const char *, const char *);
 extern void syms_of_keymap (void);