From: Stefan Monnier Date: Sun, 27 Aug 2000 15:47:59 +0000 (+0000) Subject: (menu_bar_item): Detect duplicate entries for all items X-Git-Tag: emacs-pretest-21.0.90~1946 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9cd2ced7699766c4524a116d75012ecbb9f8d6ac;p=emacs.git (menu_bar_item): Detect duplicate entries for all items to better match the key-lookup behavior. --- diff --git a/src/keyboard.c b/src/keyboard.c index 778cb16dbd6..35a199fa5c1 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -6346,29 +6346,27 @@ menu_bar_item (key, item) &XVECTOR (menu_bar_items_vector)->contents[i], (menu_bar_items_index - i - 4) * sizeof (Lisp_Object)); menu_bar_items_index -= 4; - return; } - - /* If there's no definition for this key yet, - just ignore `undefined'. */ - return; } - GCPRO1 (key); /* Is this necessary? */ - i = parse_menu_item (item, 0, 1); - UNGCPRO; - if (!i) - return; - /* If this keymap has already contributed to this KEY, don't contribute to it a second time. */ tem = Fmemq (key, menu_bar_one_keymap_changed_items); - if (!NILP (tem)) + if (!NILP (tem) || NILP (item)) return; menu_bar_one_keymap_changed_items = Fcons (key, menu_bar_one_keymap_changed_items); + /* We add to menu_bar_one_keymap_changed_items before doing the + parse_menu_item, so that if it turns out it wasn't a menu item, + it still correctly hides any further menu item. */ + GCPRO1 (key); + i = parse_menu_item (item, 0, 1); + UNGCPRO; + if (!i) + return; + item = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF]; /* Find any existing item for this KEY. */