Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-473
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-474
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-475
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-476
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-477
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-478
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-225

1 files changed, 3 insertions, 2 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 42bbeb92a18..ee4f41de6b8 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -343,7 +343,7 @@ keymap_memberp (map, maps)
 
 DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
        doc: /* Modify KEYMAP to set its parent map to PARENT.
-PARENT should be nil or another keymap.  */)
+Return PARENT.  PARENT should be nil or another keymap.  */)
      (keymap, parent)
      Lisp_Object keymap, parent;
 {
@@ -1687,7 +1687,8 @@ If a second optional argument MAPVAR is given, the map is stored as
 its value instead of as COMMAND's value; but COMMAND is still defined
 as a function.
 The third optional argument NAME, if given, supplies a menu name
-string for the map.  This is required to use the keymap as a menu.  */)
+string for the map.  This is required to use the keymap as a menu.
+This function returns COMMAND.  */)
      (command, mapvar, name)
      Lisp_Object command, mapvar, name;
 {