Remove C version of substitute-command-keys

* src/doc.c (Fsubstitute_command_keys_old): Remove.
(syms_of_doc): Remove defsubr for Fsubstitute_command_keys_old.
* src/keymap.c (describe_map, describe_map_tree)
(describe_map_compare, describe_map_elt): Remove.
* src/keymap.h: Remove 'describe_map_tree'.
* test/lisp/help-tests.el (with-substitute-command-keys-test)
(help-tests-substitute-command-keys/compare)
(help-tests-substitute-command-keys/compare-all):
Don't test the C version of 'substitute-command-keys' removed
above.

1 files changed, 0 insertions, 334 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 1eded130b5d..46fa586c753 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -91,9 +91,6 @@ static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object);
 static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object);
 static void describe_command (Lisp_Object, Lisp_Object);
 static void describe_translation (Lisp_Object, Lisp_Object);
-static void describe_map (Lisp_Object, Lisp_Object,
-                          void (*) (Lisp_Object, Lisp_Object),
-                          bool, Lisp_Object, Lisp_Object *, bool, bool);
 static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
                              void (*) (Lisp_Object, Lisp_Object), bool,
                              Lisp_Object, Lisp_Object, bool, bool);
@@ -2946,119 +2943,6 @@ You type        Translation\n\
   return Qnil;
 }
 
-/* Insert a description of the key bindings in STARTMAP,
-    followed by those of all maps reachable through STARTMAP.
-   If PARTIAL, omit certain "uninteresting" commands
-    (such as `undefined').
-   If SHADOW is non-nil, it is a list of maps;
-    don't mention keys which would be shadowed by any of them.
-   PREFIX, if non-nil, says mention only keys that start with PREFIX.
-   TITLE, if not 0, is a string to insert at the beginning.
-   TITLE should not end with a colon or a newline; we supply that.
-   If NOMENU, then omit menu-bar commands.
-
-   If TRANSL, the definitions are actually key translations
-   so print strings and vectors differently.
-
-   If ALWAYS_TITLE, print the title even if there are no maps
-   to look through.
-
-   If MENTION_SHADOW, then when something is shadowed by SHADOW,
-   don't omit it; instead, mention it but say it is shadowed.
-
-   Any inserted text ends in two newlines (used by `help-make-xrefs').  */
-
-void
-describe_map_tree (Lisp_Object startmap, bool partial, Lisp_Object shadow,
-                   Lisp_Object prefix, const char *title, bool nomenu,
-                   bool transl, bool always_title, bool mention_shadow)
-{
-  Lisp_Object maps, orig_maps, seen, sub_shadows;
-  bool something = 0;
-  const char *key_heading
-    = "\
-key             binding\n\
----             -------\n";
-
-  orig_maps = maps = Faccessible_keymaps (startmap, prefix);
-  seen = Qnil;
-  sub_shadows = Qnil;
-
-  if (nomenu)
-    {
-      Lisp_Object list;
-
-      /* Delete from MAPS each element that is for the menu bar.  */
-      for (list = maps; CONSP (list); list = XCDR (list))
-        {
-          Lisp_Object elt, elt_prefix, tem;
-
-          elt = XCAR (list);
-          elt_prefix = Fcar (elt);
-          if (ASIZE (elt_prefix) >= 1)
-            {
-              tem = Faref (elt_prefix, make_fixnum (0));
-              if (EQ (tem, Qmenu_bar))
-                maps = Fdelq (elt, maps);
-            }
-        }
-    }
-
-  if (!NILP (maps) || always_title)
-    {
-      if (title)
-        {
-          insert_string (title);
-          if (!NILP (prefix))
-            {
-              insert_string (" Starting With ");
-              insert1 (Fkey_description (prefix, Qnil));
-            }
-          insert_string (":\n");
-        }
-      insert_string (key_heading);
-      something = 1;
-    }
-
-  for (; CONSP (maps); maps = XCDR (maps))
-    {
-      register Lisp_Object elt, elt_prefix, tail;
-
-      elt = XCAR (maps);
-      elt_prefix = Fcar (elt);
-
-      sub_shadows = Flookup_key (shadow, elt_prefix, Qt);
-      if (FIXNATP (sub_shadows))
-        sub_shadows = Qnil;
-      else if (!KEYMAPP (sub_shadows)
-               && !NILP (sub_shadows)
-               && !(CONSP (sub_shadows)
-                    && KEYMAPP (XCAR (sub_shadows))))
-          /* If elt_prefix is bound to something that's not a keymap,
-             it completely shadows this map, so don't
-             describe this map at all.  */
-        goto skip;
-
-      /* Maps we have already listed in this loop shadow this map.  */
-      for (tail = orig_maps; !EQ (tail, maps); tail = XCDR (tail))
-        {
-          Lisp_Object tem;
-          tem = Fequal (Fcar (XCAR (tail)), elt_prefix);
-          if (!NILP (tem))
-            sub_shadows = Fcons (XCDR (XCAR (tail)), sub_shadows);
-        }
-
-      describe_map (Fcdr (elt), elt_prefix,
-                    transl ? describe_translation : describe_command,
-                    partial, sub_shadows, &seen, nomenu, mention_shadow);
-
-    skip: ;
-    }
-
-  if (something)
-    insert_string ("\n");
-}
-
 static int previous_description_column;
 
 static void
@@ -3121,224 +3005,6 @@ describe_translation (Lisp_Object definition, Lisp_Object args)
     insert_string ("??\n");
 }
 
-/* describe_map puts all the usable elements of a sparse keymap
-   into an array of `struct describe_map_elt',
-   then sorts them by the events.  */
-
-struct describe_map_elt
-{
-  Lisp_Object event;
-  Lisp_Object definition;
-  bool shadowed;
-};
-
-/* qsort comparison function for sorting `struct describe_map_elt' by
-   the event field.  */
-
-static int
-describe_map_compare (const void *aa, const void *bb)
-{
-  const struct describe_map_elt *a = aa, *b = bb;
-  if (FIXNUMP (a->event) && FIXNUMP (b->event))
-    return ((XFIXNUM (a->event) > XFIXNUM (b->event))
-            - (XFIXNUM (a->event) < XFIXNUM (b->event)));
-  if (!FIXNUMP (a->event) && FIXNUMP (b->event))
-    return 1;
-  if (FIXNUMP (a->event) && !FIXNUMP (b->event))
-    return -1;
-  if (SYMBOLP (a->event) && SYMBOLP (b->event))
-    /* Sort the keystroke names in the "natural" way, with (for
-       instance) "<f2>" coming between "<f1>" and "<f11>".  */
-    return string_version_cmp (SYMBOL_NAME (a->event), SYMBOL_NAME (b->event));
-  return 0;
-}
-
-/* Describe the contents of map MAP, assuming that this map itself is
-   reached by the sequence of prefix keys PREFIX (a string or vector).
-   PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above.  */
-
-static void
-describe_map (Lisp_Object map, Lisp_Object prefix,
-              void (*elt_describer) (Lisp_Object, Lisp_Object),
-              bool partial, Lisp_Object shadow,
-              Lisp_Object *seen, bool nomenu, bool mention_shadow)
-{
-  Lisp_Object tail, definition, event;
-  Lisp_Object tem;
-  Lisp_Object suppress;
-  Lisp_Object kludge;
-  bool first = 1;
-
-  /* These accumulate the values from sparse keymap bindings,
-     so we can sort them and handle them in order.  */
-  ptrdiff_t length_needed = 0;
-  struct describe_map_elt *vect;
-  ptrdiff_t slots_used = 0;
-  ptrdiff_t i;
-
-  suppress = Qnil;
-
-  if (partial)
-    suppress = intern ("suppress-keymap");
-
-  /* This vector gets used to present single keys to Flookup_key.  Since
-     that is done once per keymap element, we don't want to cons up a
-     fresh vector every time.  */
-  kludge = make_nil_vector (1);
-  definition = Qnil;
-
-  map = call1 (Qkeymap_canonicalize, map);
-
-  for (tail = map; CONSP (tail); tail = XCDR (tail))
-    length_needed++;
-
-  USE_SAFE_ALLOCA;
-  SAFE_NALLOCA (vect, 1, length_needed);
-
-  for (tail = map; CONSP (tail); tail = XCDR (tail))
-    {
-      maybe_quit ();
-
-      if (VECTORP (XCAR (tail))
-          || CHAR_TABLE_P (XCAR (tail)))
-        describe_vector (XCAR (tail),
-                         prefix, Qnil, elt_describer, partial, shadow, map,
-                         1, mention_shadow);
-      else if (CONSP (XCAR (tail)))
-        {
-          bool this_shadowed = 0;
-
-          event = XCAR (XCAR (tail));
-
-          /* Ignore bindings whose "prefix" are not really valid events.
-             (We get these in the frames and buffers menu.)  */
-          if (!(SYMBOLP (event) || FIXNUMP (event)))
-            continue;
-
-          if (nomenu && EQ (event, Qmenu_bar))
-            continue;
-
-          definition = get_keyelt (XCDR (XCAR (tail)), 0);
-
-          /* Don't show undefined commands or suppressed commands.  */
-          if (NILP (definition)) continue;
-          if (SYMBOLP (definition) && partial)
-            {
-              tem = Fget (definition, suppress);
-              if (!NILP (tem))
-                continue;
-            }
-
-          /* Don't show a command that isn't really visible
-             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))
-                    ;
-                  /* Avoid generating duplicate entries if the
-                     shadowed binding has the same definition.  */
-                  else if (mention_shadow && !EQ (tem, definition))
-                    this_shadowed = 1;
-                  else
-                    continue;
-                }
-            }
-
-          tem = Flookup_key (map, kludge, Qt);
-          if (!EQ (tem, definition)) continue;
-
-          vect[slots_used].event = event;
-          vect[slots_used].definition = definition;
-          vect[slots_used].shadowed = this_shadowed;
-          slots_used++;
-        }
-      else if (EQ (XCAR (tail), 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) && !NILP (Fequal (XCAR (tem), prefix)))
-            break;
-          *seen = Fcons (Fcons (tail, prefix), *seen);
-        }
-    }
-
-  /* If we found some sparse map events, sort them.  */
-
-  qsort (vect, slots_used, sizeof (struct describe_map_elt),
-         describe_map_compare);
-
-  /* Now output them in sorted order.  */
-
-  for (i = 0; i < slots_used; i++)
-    {
-      Lisp_Object start, end;
-
-      if (first)
-        {
-          previous_description_column = 0;
-          insert ("\n", 1);
-          first = 0;
-        }
-
-      ASET (kludge, 0, vect[i].event);
-      start = vect[i].event;
-      end = start;
-
-      definition = vect[i].definition;
-
-      /* Find consecutive chars that are identically defined.  */
-      if (FIXNUMP (vect[i].event))
-        {
-          while (i + 1 < slots_used
-                 && EQ (vect[i+1].event, make_fixnum (XFIXNUM (vect[i].event) + 1))
-                 && !NILP (Fequal (vect[i + 1].definition, definition))
-                 && vect[i].shadowed == vect[i + 1].shadowed)
-            i++;
-          end = vect[i].event;
-        }
-
-      /* Now START .. END is the range to describe next.  */
-
-      /* Insert the string to describe the event START.  */
-      insert1 (Fkey_description (kludge, prefix));
-
-      if (!EQ (start, end))
-        {
-          insert (" .. ", 4);
-
-          ASET (kludge, 0, end);
-          /* Insert the string to describe the character END.  */
-          insert1 (Fkey_description (kludge, prefix));
-        }
-
-      /* Print a description of the definition of this character.
-         elt_describer will take care of spacing out far enough
-         for alignment purposes.  */
-      (*elt_describer) (vect[i].definition, Qnil);
-
-      if (vect[i].shadowed)
-        {
-          ptrdiff_t pt = max (PT - 1, BEG);
-
-          SET_PT (pt);
-          insert_string ("\n  (this binding is currently shadowed)");
-          pt = min (PT + 1, Z);
-          SET_PT (pt);
-        }
-    }
-
-  SAFE_FREE ();
-}
-
 static void
 describe_vector_princ (Lisp_Object elt, Lisp_Object fun)
 {