diff options
| author | Chong Yidong | 2012-05-30 22:08:58 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-30 22:08:58 +0800 |
| commit | 353c87f6ff3c0834e521563f8eefa75c0b10e388 (patch) | |
| tree | 12b43f4dabd1f54c0c3c08fee94b45556e3e0c32 /src/keymap.h | |
| parent | 0652336413775df89b051f604278c4e9e5ce2784 (diff) | |
| download | emacs-353c87f6ff3c0834e521563f8eefa75c0b10e388.tar.gz emacs-353c87f6ff3c0834e521563f8eefa75c0b10e388.zip | |
* keymap.c (describe_map_tree): Revert 2011-07-07 change.
* doc.c (Fsubstitute_command_keys): Doc fix.
Fixes: debbugs:1169
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 *); |