comparison src/keymap.c @ 6976:4d540eeb2dd5

(describe_map_tree, describe_map): Skip keymaps we've seen before.

6975:b7411e378b65

     Lisp_Object startmap, shadow, prefix;
     int partial;
     char *title;
     int nomenu;
{
  Lisp_Object maps;
  struct gcpro gcpro1;
  int something = 0;
  char *key_heading
    = "\
key             binding\n\
---             -------\n";

  maps = Faccessible_keymaps (startmap, prefix);
  GCPRO1 (maps);

  if (nomenu)
    {
      Lisp_Object list;

	  if (!NILP (shmap))
	    sub_shadows = Fcons (shmap, sub_shadows);
	}

      describe_map (Fcdr (elt), Fcar (elt), describe_command, partial, sub_shadows);

    skip: ;
    }

  if (something)

  return Qnil;
}

/* Describe the contents of map MAP, assuming that this map itself is
   reached by the sequence of prefix keys KEYS (a string or vector).
   PARTIAL, SHADOW is as in `describe_map_tree' above.  */

static void
describe_map (map, keys, elt_describer, partial, shadow)
     register Lisp_Object map;
     Lisp_Object keys;
     int (*elt_describer) ();
     int partial;
     Lisp_Object shadow;
{
  Lisp_Object elt_prefix;
  Lisp_Object tail, definition, event;
  Lisp_Object tem;
  Lisp_Object suppress;

  int first = 1;
  struct gcpro gcpro1, gcpro2, gcpro3;

  if (!NILP (keys) && XFASTINT (Flength (keys)) > 0)
    {
      Lisp_Object tem;
      /* Call Fkey_description first, to avoid GC bug for the other string.  */
      tem = Fkey_description (keys);
      elt_prefix = concat2 (tem, build_string (" "));
    }
  else

  kludge = Fmake_vector (make_number (1), Qnil);
  definition = Qnil;

  GCPRO3 (elt_prefix, definition, kludge);

  for (tail = XCONS (map)->cdr; CONSP (tail); tail = Fcdr (tail))
    {
      QUIT;

      if (XTYPE (XCONS (tail)->car) == Lisp_Vector)
	describe_vector (XCONS (tail)->car,
			 elt_prefix, elt_describer, partial, shadow);
      else
	{
	  event = Fcar_safe (Fcar (tail));
	  definition = get_keyelt (Fcdr_safe (Fcar (tail)), 0);

	  /* Don't show undefined commands or suppressed commands.  */
	  if (NILP (definition)) continue;
	  if (XTYPE (definition) == Lisp_Symbol && partial)
	    {

	  /* Print a description of the definition of this character.
	     elt_describer will take care of spacing out far enough
	     for alignment purposes.  */
	  (*elt_describer) (definition);
	}
    }

  UNGCPRO;
}

6976:4d540eeb2dd5

     Lisp_Object startmap, shadow, prefix;
     int partial;
     char *title;
     int nomenu;
{
  Lisp_Object maps, seen;
  struct gcpro gcpro1, gcpro2;
  int something = 0;
  char *key_heading
    = "\
key             binding\n\
---             -------\n";

  maps = Faccessible_keymaps (startmap, prefix);
  seen = Qnil;
  GCPRO2 (maps, seen);

  if (nomenu)
    {
      Lisp_Object list;

	  if (!NILP (shmap))
	    sub_shadows = Fcons (shmap, sub_shadows);
	}

      describe_map (Fcdr (elt), Fcar (elt), describe_command,
		    partial, sub_shadows, &seen);

    skip: ;
    }

  if (something)

  return Qnil;
}

/* Describe the contents of map MAP, assuming that this map itself is
   reached by the sequence of prefix keys KEYS (a string or vector).
   PARTIAL, SHADOW are as in `describe_map_tree' above.  */

static void
describe_map (map, keys, elt_describer, partial, shadow, seen)
     register Lisp_Object map;
     Lisp_Object keys;
     int (*elt_describer) ();
     int partial;
     Lisp_Object shadow;
     Lisp_Object *seen;
{
  Lisp_Object elt_prefix;
  Lisp_Object tail, definition, event;
  Lisp_Object tem;
  Lisp_Object suppress;

  int first = 1;
  struct gcpro gcpro1, gcpro2, gcpro3;

  if (!NILP (keys) && XFASTINT (Flength (keys)) > 0)
    {
      /* Call Fkey_description first, to avoid GC bug for the other string.  */
      tem = Fkey_description (keys);
      elt_prefix = concat2 (tem, build_string (" "));
    }
  else

  kludge = Fmake_vector (make_number (1), Qnil);
  definition = Qnil;

  GCPRO3 (elt_prefix, definition, kludge);

  for (tail = map; CONSP (tail); tail = XCONS (tail)->cdr)
    {
      QUIT;

      if (XTYPE (XCONS (tail)->car) == Lisp_Vector)
	describe_vector (XCONS (tail)->car,
			 elt_prefix, elt_describer, partial, shadow);
      else if (CONSP (XCONS (tail)->car))
	{
	  event = XCONS (XCONS (tail)->car)->car;
	  definition = get_keyelt (XCONS (XCONS (tail)->car)->cdr, 0);

	  /* Don't show undefined commands or suppressed commands.  */
	  if (NILP (definition)) continue;
	  if (XTYPE (definition) == Lisp_Symbol && partial)
	    {

	  /* Print a description of the definition of this character.
	     elt_describer will take care of spacing out far enough
	     for alignment purposes.  */
	  (*elt_describer) (definition);
	}
      else if (EQ (XCONS (tail)->car, Qkeymap))
	{
	  /* The same keymap might be in the structure twice, if we're
	     using an inherited keymap.  So skip anything we've already
	     encountered.  */
	  tem = Fassq (tail, *seen);
	  if (CONSP (tem) && Fequal (XCONS (tem)->car, keys))
	    break;
	  *seen = Fcons (Fcons (tail, keys), *seen);
	}
    }

  UNGCPRO;
}