Mercurial > emacs
diff src/keymap.h @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | 8949aad5e992 |
| children | 64732fa6188a |
line wrap: on
line diff
--- a/src/keymap.h Fri Aug 06 03:43:29 2010 +0000 +++ b/src/keymap.h Sun Aug 08 22:52:25 2010 +0000 @@ -45,8 +45,8 @@ extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, char *, int, int, int, int); extern int current_minor_maps (Lisp_Object **, Lisp_Object **); -extern void initial_define_key (Lisp_Object, int, char *); -extern void initial_define_lispy_key (Lisp_Object, char *, char *); +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); extern void keys_of_keymap (void);
