comparison src/keymap.c @ 76887:a5751af0b8a7

(Fcommand_remapping): New optional argument. (where_is_internal): Use new keymaps argument. (Fkey_binding): Caller changed.

76886:da21c991a6d5

    }
}

/* This function may GC (it calls Fkey_binding).  */

DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 2, 0,
       doc: /* Return the remapping for command COMMAND in current keymaps.
Returns nil if COMMAND is not remapped (or not a symbol).

If the optional argument POSITION is non-nil, it specifies a mouse
position as returned by `event-start' and `event-end', and the
remapping occurs in the keymaps associated with it.  It can also be a
number or marker, in which case the keymap properties at the specified
buffer position instead of point are used. */)
     (command, position)
     Lisp_Object command, position;
{
  if (!SYMBOLP (command))
    return Qnil;

  ASET (command_remapping_vector, 1, command);
  return Fkey_binding (command_remapping_vector, Qnil, Qt, position);
}

/* Value is number if KEY is too long; nil if valid but has no definition. */
/* GC is possible in this function if it autoloads a keymap.  */

     command, look for a key binding (ie. remapping) for that command.  */

  if (NILP (no_remap) && SYMBOLP (value))
    {
      Lisp_Object value1;
      if (value1 = Fcommand_remapping (value, position), !NILP (value1))
	value = value1;
    }

  return value;
}

  found = Qnil;
  sequences = Qnil;

  /* If this command is remapped, then it has no key bindings
     of its own.  */
  if (NILP (no_remap) && SYMBOLP (definition))
    {
      Lisp_Object kmaps, map, remap;

      for (kmaps = maps; !NILP (kmaps); kmaps = Fcdr (kmaps))
	if (map = Fcdr (Fcar (kmaps)), KEYMAPP (map))
	  {
	    ASET (command_remapping_vector, 1, definition);
	    remap = Flookup_key (map, command_remapping_vector, Qnil);
	    if (!NILP (remap) && !INTEGERP (remap))
	      RETURN_UNGCPRO (Qnil);
	  }
    }

  for (; !NILP (maps); maps = Fcdr (maps))
    {
      /* Key sequence to reach map, and the map that it reaches */
      register Lisp_Object this, map, tem;

76887:a5751af0b8a7

    }
}

/* This function may GC (it calls Fkey_binding).  */

DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0,
       doc: /* Return the remapping for command COMMAND.
Returns nil if COMMAND is not remapped (or not a symbol).

If the optional argument POSITION is non-nil, it specifies a mouse
position as returned by `event-start' and `event-end', and the
remapping occurs in the keymaps associated with it.  It can also be a
number or marker, in which case the keymap properties at the specified
buffer position instead of point are used.  The KEYMAPS argument is
ignored if POSITION is non-nil.

If the optional argument KEYMAPS is non-nil, it should be a list of
keymaps to search for command remapping.  Otherwise, search for the
remapping in all currently active keymaps.  */)
     (command, position, keymaps)
     Lisp_Object command, position, keymaps;
{
  if (!SYMBOLP (command))
    return Qnil;

  ASET (command_remapping_vector, 1, command);

  if (NILP (keymaps))
    return Fkey_binding (command_remapping_vector, Qnil, Qt, position);
  else
    {
      Lisp_Object maps, binding;

      for (maps = keymaps; !NILP (maps); maps = Fcdr (maps))
	{
	  binding = Flookup_key (Fcar (maps), command_remapping_vector, Qnil);
	  if (!NILP (binding) && !INTEGERP (binding))
	    return binding;
	}
      return Qnil;
    }
}

/* Value is number if KEY is too long; nil if valid but has no definition. */
/* GC is possible in this function if it autoloads a keymap.  */

     command, look for a key binding (ie. remapping) for that command.  */

  if (NILP (no_remap) && SYMBOLP (value))
    {
      Lisp_Object value1;
      if (value1 = Fcommand_remapping (value, position, Qnil), !NILP (value1))
	value = value1;
    }

  return value;
}

  found = Qnil;
  sequences = Qnil;

  /* If this command is remapped, then it has no key bindings
     of its own.  */
  if (NILP (no_remap)
      && SYMBOLP (definition)
      && !NILP (Fcommand_remapping (definition, Qnil, keymaps)))
    RETURN_UNGCPRO (Qnil);

  for (; !NILP (maps); maps = Fcdr (maps))
    {
      /* Key sequence to reach map, and the map that it reaches */
      register Lisp_Object this, map, tem;