Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 43 extern Lisp_Object get_keymap (Lisp_Object, int, int); | 43 extern Lisp_Object get_keymap (Lisp_Object, int, int); |
| 44 EXFUN (Fset_keymap_parent, 2); | 44 EXFUN (Fset_keymap_parent, 2); |
| 45 extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, | 45 extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, |
| 46 char *, int, int, int, int); | 46 char *, int, int, int, int); |
| 47 extern int current_minor_maps (Lisp_Object **, Lisp_Object **); | 47 extern int current_minor_maps (Lisp_Object **, Lisp_Object **); |
| 48 extern void initial_define_key (Lisp_Object, int, char *); | 48 extern void initial_define_key (Lisp_Object, int, const char *); |
| 49 extern void initial_define_lispy_key (Lisp_Object, char *, char *); | 49 extern void initial_define_lispy_key (Lisp_Object, const char *, const char *); |
| 50 extern void syms_of_keymap (void); | 50 extern void syms_of_keymap (void); |
| 51 extern void keys_of_keymap (void); | 51 extern void keys_of_keymap (void); |
| 52 | 52 |
| 53 typedef void (*map_keymap_function_t) | 53 typedef void (*map_keymap_function_t) |
| 54 (Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data); | 54 (Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data); |
