aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorJoakim Verona2011-08-07 14:24:24 +0200
committerJoakim Verona2011-08-07 14:24:24 +0200
commit1cab149286abf2ec366c764e13c5036a3c6f4204 (patch)
tree41af6e515047b06d8506dd65ac781014d64149f5 /src/keymap.c
parent5cf126ad687c0174ab2d8de5f2acb2d1dfbefa27 (diff)
parent09ade3a37d5ecde376f264bbac1e2088eae72f53 (diff)
downloademacs-1cab149286abf2ec366c764e13c5036a3c6f4204.tar.gz
emacs-1cab149286abf2ec366c764e13c5036a3c6f4204.zip
mostly upstream
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/keymap.c b/src/keymap.c
index c461fdddbbc..3b0edbf4fb3 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -150,17 +150,6 @@ in case you use it as a menu with `x-popup-menu'. */)
150 return Fcons (Qkeymap, Qnil); 150 return Fcons (Qkeymap, Qnil);
151} 151}
152 152
153DEFUN ("make-composed-keymap", Fmake_composed_keymap, Smake_composed_keymap,
154 0, MANY, 0,
155 doc: /* Construct and return a new keymap composed of KEYMAPS.
156When looking up a key in the returned map, the key is looked in each
157keymap in turn until a binding is found.
158usage: (make-composed-keymap &rest KEYMAPS) */)
159 (ptrdiff_t nargs, Lisp_Object *args)
160{
161 return Fcons (Qkeymap, Flist (nargs, args));
162}
163
164/* This function is used for installing the standard key bindings 153/* This function is used for installing the standard key bindings
165 at initialization time. 154 at initialization time.
166 155
@@ -3761,7 +3750,6 @@ be preferred. */);
3761 defsubr (&Sset_keymap_parent); 3750 defsubr (&Sset_keymap_parent);
3762 defsubr (&Smake_keymap); 3751 defsubr (&Smake_keymap);
3763 defsubr (&Smake_sparse_keymap); 3752 defsubr (&Smake_sparse_keymap);
3764 defsubr (&Smake_composed_keymap);
3765 defsubr (&Smap_keymap_internal); 3753 defsubr (&Smap_keymap_internal);
3766 defsubr (&Smap_keymap); 3754 defsubr (&Smap_keymap);
3767 defsubr (&Scopy_keymap); 3755 defsubr (&Scopy_keymap);