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.

diff --git a/src/ChangeLog b/src/ChangeLog
index e33a080cddaa832da37411b503191d1847f37292..8a2334804f17eb9a3dd5b4f5bbc781cf141e722a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32menu.c (set_frame_menubar, initialize_frame_menubar): Don't
+       use FRAME_MENU_BAR_ITEMS as an lvalue.
+
 2012-08-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * buffer.h (struct buffer): Revert `indirections' to a simple int;

diff --git a/src/w32menu.c b/src/w32menu.c
index 80f48bdf705dc359f9fbb70be71e9cc19cba0969..7ea4633235ed2c7fff6a06175f93abbaea312d99 100644 (file)
--- 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);
 }