aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.h
diff options
context:
space:
mode:
authorJoakim Verona2011-06-16 00:22:07 +0200
committerJoakim Verona2011-06-16 00:22:07 +0200
commita7513ade3bc0fe79430d5541d88c9dcda0932bec (patch)
tree4383951ba698a11e9f8933a9d8c72e00aa872a10 /src/keymap.h
parent4bd51ad5c3445b644dfb017d5b57b10a90aa325f (diff)
parent4bba86e6210a74326e843a8fdc8409127105e1fe (diff)
downloademacs-a7513ade3bc0fe79430d5541d88c9dcda0932bec.tar.gz
emacs-a7513ade3bc0fe79430d5541d88c9dcda0932bec.zip
merge from upstream
Diffstat (limited to 'src/keymap.h')
-rw-r--r--src/keymap.h2
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;
27EXFUN (Fmake_sparse_keymap, 1); 27EXFUN (Fmake_sparse_keymap, 1);
28EXFUN (Fkeymap_prompt, 1); 28EXFUN (Fkeymap_prompt, 1);
29EXFUN (Fdefine_key, 3); 29EXFUN (Fdefine_key, 3);
30EXFUN (Flookup_key, 3);
31EXFUN (Fcommand_remapping, 3); 30EXFUN (Fcommand_remapping, 3);
32EXFUN (Fkey_binding, 4); 31EXFUN (Fkey_binding, 4);
33EXFUN (Fkey_description, 2); 32EXFUN (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