aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1996-04-29 15:29:52 +0000
committerRichard M. Stallman1996-04-29 15:29:52 +0000
commitf04366cb45618334d183b74f92fb28bd1dff79d4 (patch)
tree252dfe60c5be94733d2deac05f248f733d48172f
parent10992b014c75c57f34382faf5539df27e9db46cd (diff)
downloademacs-f04366cb45618334d183b74f92fb28bd1dff79d4.tar.gz
emacs-f04366cb45618334d183b74f92fb28bd1dff79d4.zip
(set_frame_menubar): FRAME_MENU_BAR_ITEMS now has four elements per item.
-rw-r--r--src/xmenu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 9e85afdfcda..ef2bbd792ac 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1643,7 +1643,7 @@ set_frame_menubar (f, first_time, deep_p)
1643 menu_items = f->menu_bar_vector; 1643 menu_items = f->menu_bar_vector;
1644 menu_items_allocated = XVECTOR (menu_items)->size; 1644 menu_items_allocated = XVECTOR (menu_items)->size;
1645 init_menu_items (); 1645 init_menu_items ();
1646 for (i = 0; i < XVECTOR (items)->size; i += 3) 1646 for (i = 0; i < XVECTOR (items)->size; i += 4)
1647 { 1647 {
1648 Lisp_Object key, string, maps; 1648 Lisp_Object key, string, maps;
1649 1649
@@ -1686,7 +1686,7 @@ set_frame_menubar (f, first_time, deep_p)
1686 /* Now GC cannot happen during the lifetime of the widget_value, 1686 /* Now GC cannot happen during the lifetime of the widget_value,
1687 so it's safe to store data from a Lisp_String. */ 1687 so it's safe to store data from a Lisp_String. */
1688 wv = first_wv->contents; 1688 wv = first_wv->contents;
1689 for (i = 0; i < XVECTOR (items)->size; i += 3) 1689 for (i = 0; i < XVECTOR (items)->size; i += 4)
1690 { 1690 {
1691 Lisp_Object string; 1691 Lisp_Object string;
1692 string = XVECTOR (items)->contents[i + 1]; 1692 string = XVECTOR (items)->contents[i + 1];
@@ -1706,7 +1706,7 @@ set_frame_menubar (f, first_time, deep_p)
1706 just the top level menu bar strings. */ 1706 just the top level menu bar strings. */
1707 1707
1708 items = FRAME_MENU_BAR_ITEMS (f); 1708 items = FRAME_MENU_BAR_ITEMS (f);
1709 for (i = 0; i < XVECTOR (items)->size; i += 3) 1709 for (i = 0; i < XVECTOR (items)->size; i += 4)
1710 { 1710 {
1711 Lisp_Object string; 1711 Lisp_Object string;
1712 1712