diff options
| author | Kenichi Handa | 2012-07-17 07:09:08 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-07-17 07:09:08 +0900 |
| commit | 8c536f15bf95916d56bb50495d22b7da7e09fff9 (patch) | |
| tree | ac6f8bf5103bdbd1d6a75f05def9bc7aa9e96547 /src/keymap.h | |
| parent | 21a8caaa4af24f258e6c7f80c1fc913b00aee044 (diff) | |
| parent | c05cf3902ae658cc8bf413124245c9e1cdcca2d7 (diff) | |
| download | emacs-8c536f15bf95916d56bb50495d22b7da7e09fff9.tar.gz emacs-8c536f15bf95916d56bb50495d22b7da7e09fff9.zip | |
merge trunk
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.h b/src/keymap.h index 234ffce471d..d9334cda0f4 100644 --- a/src/keymap.h +++ b/src/keymap.h | |||
| @@ -47,7 +47,7 @@ EXFUN (Fcurrent_active_maps, 2); | |||
| 47 | extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int); | 47 | extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int); |
| 48 | extern Lisp_Object get_keymap (Lisp_Object, int, int); | 48 | extern Lisp_Object get_keymap (Lisp_Object, int, int); |
| 49 | EXFUN (Fset_keymap_parent, 2); | 49 | EXFUN (Fset_keymap_parent, 2); |
| 50 | extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, | 50 | extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, |
| 51 | const char *, int, int, int, int); | 51 | const char *, int, int, int, int); |
| 52 | extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **); | 52 | extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **); |
| 53 | extern void initial_define_key (Lisp_Object, int, const char *); | 53 | extern void initial_define_key (Lisp_Object, int, const char *); |