comparison src/keymap.c @ 106972:d026329addd9

* keymap.c (shadow_lookup): Add `remap' arg. (describe_map, describe_vector): Update calls to shadow_lookup. (Fwhere_is_internal): Fix up handling of `remapped_sequences' and `remapped' so this flag is applicable to `sequence'. Be careful to perform remapping during shadow_lookup check of remapped_equences.

106953:a1e356d208cd

static void where_is_internal_1 P_ ((Lisp_Object key, Lisp_Object binding,
				     Lisp_Object args, void *data));

/* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map.
   Returns the first non-nil binding found in any of those maps.  */

static Lisp_Object
shadow_lookup (shadow, key, flag)
     Lisp_Object shadow, key, flag;
{
  Lisp_Object tail, value;

  for (tail = shadow; CONSP (tail); tail = XCDR (tail))
    {

			       Fsubstring (key, make_number (0), value), flag);
	  if (!NILP (value))
	    return Qnil;
	}
      else if (!NILP (value))
	return value;
    }
  return Qnil;
}

static Lisp_Object Vmouse_events;

      && !NILP (firstonly)
      && !NILP (tem = Fget (definition, QCadvertised_binding)))
    {
      /* We have a list of advertized bindings.  */
      while (CONSP (tem))
	if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil), definition))
	  return XCAR (tem);
	else
	  tem = XCDR (tem);
      if (EQ (shadow_lookup (keymaps, tem, Qnil), definition))
	return tem;
    }

  sequences = Freverse (where_is_internal (definition, keymaps,
					   !NILP (noindirect), nomenus));

  while (CONSP (sequences))
    {
      Lisp_Object sequence, function;
	  
      sequence = XCAR (sequences);
      sequences = XCDR (sequences);

      if (NILP (sequences) && !remapped)
	{
	  sequences = remapped_sequences;
	  remapped = 1;
	}

      /* Verify that this key binding is not shadowed by another
	 binding for the same key, before we say it exists.

	 Mechanism: look for local definition of this key and if
	 it is defined and does not match what we found then
	 ignore this key.

	 Either nil or number as value from Flookup_key
	 means undefined.  */
      if (!EQ (shadow_lookup (keymaps, sequence, Qnil), definition))
	continue;

      /* If the current sequence is a command remapping with
	 format [remap COMMAND], find the key sequences
	 which run COMMAND, and use those sequences instead.  */

	     because a local definition of the same key shadows it.  */

	  ASET (kludge, 0, event);
	  if (!NILP (shadow))
	    {
	      tem = shadow_lookup (shadow, kludge, Qt);
	      if (!NILP (tem))
		{
		  /* If both bindings are keymaps, this key is a prefix key,
		     so don't say it is shadowed.  */
		  if (KEYMAPP (definition) && KEYMAPP (tem))

      /* If this binding is shadowed by some other map, ignore it.  */
      if (!NILP (shadow))
	{
	  Lisp_Object tem;

	  tem = shadow_lookup (shadow, kludge, Qt);

	  if (!NILP (tem))
	    {
	      if (mention_shadow)
		this_shadowed = 1;

106972:d026329addd9

static void where_is_internal_1 P_ ((Lisp_Object key, Lisp_Object binding,
				     Lisp_Object args, void *data));

/* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map.
   Returns the first non-nil binding found in any of those maps.
   If REMAP is true, pass the result of the lookup through command
   remapping before returning it.  */

static Lisp_Object
shadow_lookup (Lisp_Object shadow, Lisp_Object key, Lisp_Object flag,
	       int remap)
{
  Lisp_Object tail, value;

  for (tail = shadow; CONSP (tail); tail = XCDR (tail))
    {

			       Fsubstring (key, make_number (0), value), flag);
	  if (!NILP (value))
	    return Qnil;
	}
      else if (!NILP (value))
	{
	  Lisp_Object remapping;
	  if (remap && SYMBOLP (value)
	      && (remapping = Fcommand_remapping (value, Qnil, shadow),
		  !NILP (remapping)))
	    return remapping;
	  else
	    return value;
	}
    }
  return Qnil;
}

static Lisp_Object Vmouse_events;

      && !NILP (firstonly)
      && !NILP (tem = Fget (definition, QCadvertised_binding)))
    {
      /* We have a list of advertized bindings.  */
      while (CONSP (tem))
	if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
	  return XCAR (tem);
	else
	  tem = XCDR (tem);
      if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition))
	return tem;
    }

  sequences = Freverse (where_is_internal (definition, keymaps,
					   !NILP (noindirect), nomenus));

  while (CONSP (sequences)
	 /* If we're at the end of the `sequences' list and we haven't
	    considered remapped sequences yet, copy them over and
	    process them.  */
	 || (!remapped && (sequences = remapped_sequences,
			   remapped = 1),
	     CONSP (sequences)))
    {
      Lisp_Object sequence, function;
	  
      sequence = XCAR (sequences);
      sequences = XCDR (sequences);

      /* Verify that this key binding is not shadowed by another
	 binding for the same key, before we say it exists.

	 Mechanism: look for local definition of this key and if
	 it is defined and does not match what we found then
	 ignore this key.

	 Either nil or number as value from Flookup_key
	 means undefined.  */
      if (!EQ (shadow_lookup (keymaps, sequence, Qnil, remapped),
	       definition))
	continue;

      /* If the current sequence is a command remapping with
	 format [remap COMMAND], find the key sequences
	 which run COMMAND, and use those sequences instead.  */

	     because a local definition of the same key shadows it.  */

	  ASET (kludge, 0, event);
	  if (!NILP (shadow))
	    {
	      tem = shadow_lookup (shadow, kludge, Qt, 0);
	      if (!NILP (tem))
		{
		  /* If both bindings are keymaps, this key is a prefix key,
		     so don't say it is shadowed.  */
		  if (KEYMAPP (definition) && KEYMAPP (tem))

      /* If this binding is shadowed by some other map, ignore it.  */
      if (!NILP (shadow))
	{
	  Lisp_Object tem;

	  tem = shadow_lookup (shadow, kludge, Qt, 0);

	  if (!NILP (tem))
	    {
	      if (mention_shadow)
		this_shadowed = 1;