aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 48108fbfa12..858d0573c70 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -342,6 +342,7 @@ keymap_memberp (map, maps)
342 342
343DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, 343DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
344 doc: /* Modify KEYMAP to set its parent map to PARENT. 344 doc: /* Modify KEYMAP to set its parent map to PARENT.
345Return PARENT.
345PARENT should be nil or another keymap. */) 346PARENT should be nil or another keymap. */)
346 (keymap, parent) 347 (keymap, parent)
347 Lisp_Object keymap, parent; 348 Lisp_Object keymap, parent;
@@ -1686,7 +1687,8 @@ If a second optional argument MAPVAR is given, the map is stored as
1686its value instead of as COMMAND's value; but COMMAND is still defined 1687its value instead of as COMMAND's value; but COMMAND is still defined
1687as a function. 1688as a function.
1688The third optional argument NAME, if given, supplies a menu name 1689The third optional argument NAME, if given, supplies a menu name
1689string for the map. This is required to use the keymap as a menu. */) 1690string for the map. This is required to use the keymap as a menu.
1691This function returns COMMAND. */)
1690 (command, mapvar, name) 1692 (command, mapvar, name)
1691 Lisp_Object command, mapvar, name; 1693 Lisp_Object command, mapvar, name;
1692{ 1694{