[Emacs-diffs] /srv/bzr/emacs/trunk r109472: Fix usage of FRAME_MENU_BAR_ITEMS in w32menu.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109472
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 19:36:47 +0300
message:
  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.
modified:
  src/ChangeLog
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-06 16:22:43 +0000
+++ b/src/ChangeLog     2012-08-06 16:36:47 +0000
@@ -1,3 +1,8 @@
+2012-08-06  Eli Zaretskii  <address@hidden>
+
+       * w32menu.c (set_frame_menubar, initialize_frame_menubar): Don't
+       use FRAME_MENU_BAR_ITEMS as an lvalue.
+
 2012-08-06  Stefan Monnier  <address@hidden>
 
        * buffer.h (struct buffer): Revert `indirections' to a simple int;

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-08-06 10:24:26 +0000
+++ b/src/w32menu.c     2012-08-06 16:36:47 +0000
@@ -413,7 +413,7 @@
       /* 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 @@
 {
   /* 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);
 }