# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 716801376 0
# Node ID f7b55bfe1c059b17f194a162519f9e3083b1bc42
# Parent  14a07c6ffb048b6b408936a302f2d0359b66231d
(get_keyelt): Skip menu help string after menu item name.

diff -r 14a07c6ffb04 -r f7b55bfe1c05 src/keymap.c
--- a/src/keymap.c	Thu Sep 17 21:54:44 1992 +0000
+++ b/src/keymap.c	Fri Sep 18 07:29:36 1992 +0000
@@ -269,7 +269,7 @@
    and INDEX is the object to look up in KEYMAP to yield the definition.
 
    Also if OBJECT has a menu string as the first element,
-   remove that.  */
+   remove that.  Also remove a menu help string as second element.  */
 
 Lisp_Object
 get_keyelt (object)
@@ -292,7 +292,14 @@
 	 will be used by HierarKey menus.  */
       else if (XTYPE (object) == Lisp_Cons
 	       && XTYPE (XCONS (object)->car) == Lisp_String)
-	object = XCONS (object)->cdr;
+	{
+	  object = XCONS (object)->cdr;
+	  /* Also remove a menu help string, if any,
+	     following the menu item name.  */
+	  if (XTYPE (object) == Lisp_Cons
+	      && XTYPE (XCONS (object)->car) == Lisp_String)
+	    object = XCONS (object)->cdr;
+	}
 
       else
 	/* Anything else is really the value.  */