(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 d29903b375bcf098f01a1d1126e2e77b421c9f00..7179e3a5321a0739837b98cd28930dc7164c62dd 100644 (file)
--- 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.  */