diff options
| author | Kenichi Handa | 2012-07-17 07:25:00 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-07-17 07:25:00 +0900 |
| commit | 69c41c4070c86baac11a627e9c3d366420aeb7cc (patch) | |
| tree | e07fda92570b5e4f264c9a7869b57960940008f0 /src/keymap.h | |
| parent | 8c536f15bf95916d56bb50495d22b7da7e09fff9 (diff) | |
| parent | 758e556a7ab8f61c007e34310ba399a9aaf15362 (diff) | |
| download | emacs-69c41c4070c86baac11a627e9c3d366420aeb7cc.tar.gz emacs-69c41c4070c86baac11a627e9c3d366420aeb7cc.zip | |
merge trunk
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/keymap.h b/src/keymap.h index d9334cda0f4..5ed70c67b85 100644 --- a/src/keymap.h +++ b/src/keymap.h | |||
| @@ -34,19 +34,9 @@ extern Lisp_Object Qkeymap, Qmenu_bar; | |||
| 34 | extern Lisp_Object Qremap; | 34 | extern Lisp_Object Qremap; |
| 35 | extern Lisp_Object Qmenu_item; | 35 | extern Lisp_Object Qmenu_item; |
| 36 | extern Lisp_Object current_global_map; | 36 | extern Lisp_Object current_global_map; |
| 37 | EXFUN (Fmake_sparse_keymap, 1); | ||
| 38 | EXFUN (Fkeymap_prompt, 1); | ||
| 39 | EXFUN (Fdefine_key, 3); | ||
| 40 | EXFUN (Fcommand_remapping, 3); | ||
| 41 | EXFUN (Fkey_binding, 4); | ||
| 42 | EXFUN (Fkey_description, 2); | ||
| 43 | extern char *push_key_description (EMACS_INT, char *, int); | 37 | extern char *push_key_description (EMACS_INT, char *, int); |
| 44 | EXFUN (Fsingle_key_description, 2); | ||
| 45 | EXFUN (Fwhere_is_internal, 5); | ||
| 46 | EXFUN (Fcurrent_active_maps, 2); | ||
| 47 | extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int); | 38 | extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int); |
| 48 | extern Lisp_Object get_keymap (Lisp_Object, int, int); | 39 | extern Lisp_Object get_keymap (Lisp_Object, int, int); |
| 49 | EXFUN (Fset_keymap_parent, 2); | ||
| 50 | extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, | 40 | extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, |
| 51 | const char *, int, int, int, int); | 41 | const char *, int, int, int, int); |
| 52 | extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **); | 42 | extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **); |