(Fsingle_key_description): Undo previous change.

[gnu-emacs] / src / keymap.c

diff --git a/src/keymap.c b/src/keymap.c
index 8f9b9d8a01153763e4741552fd9f7e1f740c9a8d..6d535751dc98fa381cdbbb5105abec9e138bac8c 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1749,7 +1749,8 @@ describe_buffer_bindings (arg)
      Lisp_Object arg;
 {
   Lisp_Object descbuf, prefix, shadow;
-  register Lisp_Object start1, start2;
+  register Lisp_Object start1;
+  struct gcpro gcpro1;
 
   char *alternate_heading
     = "\
@@ -1760,6 +1761,7 @@ nominal         alternate\n\
   descbuf = XCONS (arg)->car;
   prefix = XCONS (arg)->cdr;
   shadow = Qnil;
+  GCPRO1 (shadow);
 
   Fset_buffer (Vstandard_output);
 
@@ -1816,21 +1818,15 @@ nominal         alternate\n\
           because it takes care of other features when doing so.  */
        char *title, *p;
 
-       if (XTYPE (modes[i]) == Lisp_Symbol)
-         {
-           p = title = (char *) alloca (40 + XSYMBOL (modes[i])->name->size);
-           *p++ = '`';
-           bcopy (XSYMBOL (modes[i])->name->data, p,
-                  XSYMBOL (modes[i])->name->size);
-           p += XSYMBOL (modes[i])->name->size;
-           *p++ = '\'';
-         }
-       else
-         {
-           p = title = (char *) alloca (40 + 20);
-           bcopy ("Strangely Named", p, sizeof ("Strangely Named") - 1);
-           p += sizeof ("Strangely Named") - 1;
-         }
+       if (XTYPE (modes[i]) != Lisp_Symbol)
+         abort();
+
+       p = title = (char *) alloca (40 + XSYMBOL (modes[i])->name->size);
+       *p++ = '`';
+       bcopy (XSYMBOL (modes[i])->name->data, p,
+              XSYMBOL (modes[i])->name->size);
+       p += XSYMBOL (modes[i])->name->size;
+       *p++ = '\'';
        bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1);
        p += sizeof (" Minor Mode Bindings") - 1;
        *p = 0;
@@ -1857,6 +1853,7 @@ nominal         alternate\n\
                     "Global Bindings", 0);
 
   Fset_buffer (descbuf);
+  UNGCPRO;
   return Qnil;
 }
 
@@ -1878,8 +1875,8 @@ describe_map_tree (startmap, partial, shadow, prefix, title, nomenu)
      char *title;
      int nomenu;
 {
-  Lisp_Object maps;
-  struct gcpro gcpro1;
+  Lisp_Object maps, seen, sub_shadows;
+  struct gcpro gcpro1, gcpro2, gcpro3;
   int something = 0;
   char *key_heading
     = "\
@@ -1887,7 +1884,9 @@ key             binding\n\
 ---             -------\n";
 
   maps = Faccessible_keymaps (startmap, prefix);
-  GCPRO1 (maps);
+  seen = Qnil;
+  sub_shadows = Qnil;
+  GCPRO3 (maps, seen, sub_shadows);
 
   if (nomenu)
     {
@@ -1927,7 +1926,7 @@ key             binding\n\
 
   for (; !NILP (maps); maps = Fcdr (maps))
     {
-      register Lisp_Object elt, prefix, sub_shadows, tail;
+      register Lisp_Object elt, prefix, tail;
 
       elt = Fcar (maps);
       prefix = Fcar (elt);
@@ -1967,7 +1966,8 @@ key             binding\n\
            sub_shadows = Fcons (shmap, sub_shadows);
        }
 
-      describe_map (Fcdr (elt), Fcar (elt), describe_command, partial, sub_shadows);
+      describe_map (Fcdr (elt), Fcar (elt), describe_command,
+                   partial, sub_shadows, &seen);
 
     skip: ;
     }
@@ -2024,15 +2024,16 @@ shadow_lookup (shadow, key, flag)
 
 /* 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.  */
+   PARTIAL, SHADOW are as in `describe_map_tree' above.  */
 
 static void
-describe_map (map, keys, elt_describer, partial, shadow)
+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;
@@ -2044,7 +2045,6 @@ describe_map (map, keys, elt_describer, partial, shadow)
 
   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 (" "));
@@ -2063,17 +2063,20 @@ describe_map (map, keys, elt_describer, partial, shadow)
 
   GCPRO3 (elt_prefix, definition, kludge);
 
-  for (tail = XCONS (map)->cdr; CONSP (tail); tail = Fcdr (tail))
+  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
+      else if (CONSP (XCONS (tail)->car))
        {
-         event = Fcar_safe (Fcar (tail));
-         definition = get_keyelt (Fcdr_safe (Fcar (tail)), 0);
+         event = XCONS (XCONS (tail)->car)->car;
+         /* Don't show individual items in the Buffers menu.  */
+         if (STRINGP (event))
+           continue;
+         definition = get_keyelt (XCONS (XCONS (tail)->car)->cdr, 0);
 
          /* Don't show undefined commands or suppressed commands.  */
          if (NILP (definition)) continue;
@@ -2114,6 +2117,16 @@ describe_map (map, keys, elt_describer, partial, shadow)
             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;