[Emacs-diffs] Changes to emacs/src/keymap.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.282.4.9 emacs/src/keymap.c:1.282.4.10
*** emacs/src/keymap.c:1.282.4.9        Tue Jun 29 16:46:03 2004
--- emacs/src/keymap.c  Tue Aug  3 00:03:00 2004
***************
*** 343,349 ****
  
  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.  */)
       (keymap, parent)
       Lisp_Object keymap, parent;
  {
--- 343,349 ----
  
  DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
         doc: /* Modify KEYMAP to set its parent map to PARENT.
! Return PARENT.  PARENT should be nil or another keymap.  */)
       (keymap, parent)
       Lisp_Object keymap, parent;
  {
***************
*** 1719,1725 ****
  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.  */)
       (command, mapvar, name)
       Lisp_Object command, mapvar, name;
  {
--- 1719,1726 ----
  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.
! This function returns COMMAND.  */)
       (command, mapvar, name)
       Lisp_Object command, mapvar, name;
  {