(Fsingle_key_description): Undo previous change.

(describe_map): Skip string entries.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 7169e6cb49f..6d535751dc9 100644
--- 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.");
     }
 }
 
@@ -2076,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.  */