From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 23 May 1994 06:32:59 +0000 (+0000)
Subject: (menu_bar_one_keymap):
X-Git-Tag: emacs-19.34~8203
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8aa034e1fbfe26de0d4d4f3eb21854d0e12f729f;p=emacs.git

(menu_bar_one_keymap):
When there's no item string, use Qnil.
Don't ever put `undefined' into the list of definitions.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index d29903b375b..7179e3a5321 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3758,7 +3758,7 @@ menu_bar_one_keymap (keymap)
 		menu_bar_item (key, item_string, Fcdr (binding));
 	    }
 	  else if (EQ (binding, Qundefined))
-	    menu_bar_item (key, item_string, binding);
+	    menu_bar_item (key, Qnil, binding);
 	}
       else if (XTYPE (item) == Lisp_Vector)
 	{
@@ -3777,7 +3777,7 @@ menu_bar_one_keymap (keymap)
 		    menu_bar_item (key, item_string, Fcdr (binding));
 		}
 	      else if (EQ (binding, Qundefined))
-		menu_bar_item (key, item_string, binding);
+		menu_bar_item (key, Qnil, binding);
 	    }
 	}
     }
@@ -3818,6 +3818,10 @@ menu_bar_item (key, item_string, def)
 	    menu_bar_items_index -= 3;
 	    return;
 	  }
+
+      /* If there's no definition for this key yet,
+	 just ignore `undefined'.  */
+      return;
     }
 
   /* See if this entry is enabled.  */