aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 4c23977ef41..98e04f65717 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -343,7 +343,7 @@ keymap_memberp (map, maps)
343 343
344DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, 344DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
345 doc: /* Modify KEYMAP to set its parent map to PARENT. 345 doc: /* Modify KEYMAP to set its parent map to PARENT.
346PARENT should be nil or another keymap. */) 346Return PARENT. PARENT should be nil or another keymap. */)
347 (keymap, parent) 347 (keymap, parent)
348 Lisp_Object keymap, parent; 348 Lisp_Object keymap, parent;
349{ 349{
@@ -1719,7 +1719,8 @@ If a second optional argument MAPVAR is given, the map is stored as
1719its value instead of as COMMAND's value; but COMMAND is still defined 1719its value instead of as COMMAND's value; but COMMAND is still defined
1720as a function. 1720as a function.
1721The third optional argument NAME, if given, supplies a menu name 1721The third optional argument NAME, if given, supplies a menu name
1722string for the map. This is required to use the keymap as a menu. */) 1722string for the map. This is required to use the keymap as a menu.
1723This function returns COMMAND. */)
1723 (command, mapvar, name) 1724 (command, mapvar, name)
1724 Lisp_Object command, mapvar, name; 1725 Lisp_Object command, mapvar, name;
1725{ 1726{