comparison src/keymap.c @ 14129:d0b95da4f1f2

(describe_map): New arg nomenu. (describe_map_tree): Pass that arg.

14128:6b1ecb157b48

	    sub_shadows = Fcons (shmap, sub_shadows);
	}

      describe_map (Fcdr (elt), Fcar (elt),
		    transl ? describe_translation : 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;

	  event = XCONS (XCONS (tail)->car)->car;

	  /* Ignore bindings whose "keys" are not really valid events.
	     (We get these in the frames and buffers menu.)  */
	  if (! (SYMBOLP (event) || INTEGERP (event)))
	    continue;

	  definition = get_keyelt (XCONS (XCONS (tail)->car)->cdr, 0);

	  /* Don't show undefined commands or suppressed commands.  */

14129:d0b95da4f1f2

	    sub_shadows = Fcons (shmap, sub_shadows);
	}

      describe_map (Fcdr (elt), Fcar (elt),
		    transl ? describe_translation : describe_command,
		    partial, sub_shadows, &seen, nomenu);

    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, NOMENU are as in `describe_map_tree' above.  */

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

	  event = XCONS (XCONS (tail)->car)->car;

	  /* Ignore bindings whose "keys" are not really valid events.
	     (We get these in the frames and buffers menu.)  */
	  if (! (SYMBOLP (event) || INTEGERP (event)))
	    continue;

	  if (nomenu && EQ (event, Qmenu_bar))
	    continue;

	  definition = get_keyelt (XCONS (XCONS (tail)->car)->cdr, 0);

	  /* Don't show undefined commands or suppressed commands.  */