diff options
| author | Chong Yidong | 2012-05-31 14:08:06 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-31 14:08:06 +0800 |
| commit | efc00ab16e2890b75d7224434ac43fe944ade4dd (patch) | |
| tree | 28c1078ca32b96402cd1a5f618a17b3526143f27 /src/keymap.h | |
| parent | ba93a18774352c97d6dd73c73141cbff6305581b (diff) | |
| parent | dd41169b6cb0105b0766f3d368c657ebafc19cba (diff) | |
| download | emacs-efc00ab16e2890b75d7224434ac43fe944ade4dd.tar.gz emacs-efc00ab16e2890b75d7224434ac43fe944ade4dd.zip | |
Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de
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 *); |