comparison src/keymap.c @ 31496:946e1ba42cc9

(Fset_keymap_parent): Check for cycles in keymap inheritance.

31495:1cec17cdcff1

    }

  return Qnil;
}

/* Set the parent keymap of MAP to PARENT.  */

DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
  "Modify KEYMAP to set its parent map to PARENT.\n\
PARENT should be nil or another keymap.")

  keymap = get_keymap_1 (keymap, 1, 1);
  GCPRO1 (keymap);
  
  if (!NILP (parent))
    parent = get_keymap_1 (parent, 1, 1);

  /* Skip past the initial element `keymap'.  */
  prev = keymap;
  while (1)
    {

31496:946e1ba42cc9

    }

  return Qnil;
}


/* Set the parent keymap of MAP to PARENT.  */

DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
  "Modify KEYMAP to set its parent map to PARENT.\n\
PARENT should be nil or another keymap.")

  keymap = get_keymap_1 (keymap, 1, 1);
  GCPRO1 (keymap);
  
  if (!NILP (parent))
    {
      Lisp_Object k;
      
      parent = get_keymap_1 (parent, 1, 1);

      /* Check for cycles.  */
      k = parent;
      while (KEYMAPP (k) && !EQ (keymap, k))
	k = Fkeymap_parent (k);
      if (EQ (keymap, k))
	error ("Cyclic keymap inheritance");
    }

  /* Skip past the initial element `keymap'.  */
  prev = keymap;
  while (1)
    {