(Fsingle_key_description): Undo previous change.

[gnu-emacs] / src / keymap.c

diff --git a/src/keymap.c b/src/keymap.c
index 55745ffcb39d3badd9ab905362fcff4d04eab578..6d535751dc98fa381cdbbb5105abec9e138bac8c 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1438,11 +1438,8 @@ Control characters turn into C-whatever, etc.")
     case Lisp_Symbol:          /* Function key or event-symbol */
       return Fsymbol_name (key);
 
-    case Lisp_String:
-      return key;
-
     default:
-      error ("KEY must be an integer, cons, string, or symbol.");
+      error ("KEY must be an integer, cons, or symbol.");
     }
 }
 
@@ -1752,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
     = "\
@@ -1763,6 +1761,7 @@ nominal         alternate\n\
   descbuf = XCONS (arg)->car;
   prefix = XCONS (arg)->cdr;
   shadow = Qnil;
+  GCPRO1 (shadow);
 
   Fset_buffer (Vstandard_output);
 
@@ -1819,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;
@@ -1860,6 +1853,7 @@ nominal         alternate\n\
                     "Global Bindings", 0);
 
   Fset_buffer (descbuf);
+  UNGCPRO;
   return Qnil;
 }
 
@@ -1881,8 +1875,8 @@ describe_map_tree (startmap, partial, shadow, prefix, title, nomenu)
      char *title;
      int nomenu;
 {
-  Lisp_Object maps, seen;
-  struct gcpro gcpro1, gcpro2;
+  Lisp_Object maps, seen, sub_shadows;
+  struct gcpro gcpro1, gcpro2, gcpro3;
   int something = 0;
   char *key_heading
     = "\
@@ -1891,7 +1885,8 @@ key             binding\n\
 
   maps = Faccessible_keymaps (startmap, prefix);
   seen = Qnil;
-  GCPRO2 (maps, seen);
+  sub_shadows = Qnil;
+  GCPRO3 (maps, seen, sub_shadows);
 
   if (nomenu)
     {
@@ -1931,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);
@@ -2078,6 +2073,9 @@ describe_map (map, keys, elt_describer, partial, shadow, seen)
       else if (CONSP (XCONS (tail)->car))
        {
          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.  */