diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/keymap.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/keymap.h b/src/keymap.h index 38c6e986784..2b9d58b39dc 100644 --- a/src/keymap.h +++ b/src/keymap.h | |||
| @@ -27,7 +27,6 @@ extern Lisp_Object current_global_map; | |||
| 27 | EXFUN (Fmake_sparse_keymap, 1); | 27 | EXFUN (Fmake_sparse_keymap, 1); |
| 28 | EXFUN (Fkeymap_prompt, 1); | 28 | EXFUN (Fkeymap_prompt, 1); |
| 29 | EXFUN (Fdefine_key, 3); | 29 | EXFUN (Fdefine_key, 3); |
| 30 | EXFUN (Flookup_key, 3); | ||
| 31 | EXFUN (Fcommand_remapping, 3); | 30 | EXFUN (Fcommand_remapping, 3); |
| 32 | EXFUN (Fkey_binding, 4); | 31 | EXFUN (Fkey_binding, 4); |
| 33 | EXFUN (Fkey_description, 2); | 32 | EXFUN (Fkey_description, 2); |
| @@ -53,4 +52,3 @@ extern void map_keymap_canonical (Lisp_Object map, | |||
| 53 | Lisp_Object args, void *data); | 52 | Lisp_Object args, void *data); |
| 54 | 53 | ||
| 55 | #endif | 54 | #endif |
| 56 | |||