From 5f50daf249281ef6ffbd11b5e89c36c4b8235851 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 6 Aug 2012 19:36:47 +0300 Subject: [PATCH] Fix usage of FRAME_MENU_BAR_ITEMS in w32menu.c. src/w32menu.c (set_frame_menubar, initialize_frame_menubar): Don't use FRAME_MENU_BAR_ITEMS as an lvalue. --- src/ChangeLog | 5 +++++ src/w32menu.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e33a080cdda..8a2334804f1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-06 Eli Zaretskii + + * w32menu.c (set_frame_menubar, initialize_frame_menubar): Don't + use FRAME_MENU_BAR_ITEMS as an lvalue. + 2012-08-06 Stefan Monnier * buffer.h (struct buffer): Revert `indirections' to a simple int; diff --git a/src/w32menu.c b/src/w32menu.c index 80f48bdf705..7ea4633235e 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -413,7 +413,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) /* Run the hooks. */ safe_run_hooks (Qactivate_menubar_hook); safe_run_hooks (Qmenu_bar_update_hook); - FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); + FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); items = FRAME_MENU_BAR_ITEMS (f); @@ -615,7 +615,7 @@ initialize_frame_menubar (FRAME_PTR f) { /* This function is called before the first chance to redisplay the frame. It has to be, so the frame will have the right size. */ - FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); + FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); set_frame_menubar (f, 1, 1); } -- 2.39.2