[Emacs-diffs] /srv/bzr/emacs/trunk r109468: Use FSET.

[Jan Djärv]

------------------------------------------------------------
revno: 109468
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 14:54:54 +0200
message:
  Use FSET.
  
  * nsmenu.m (ns_update_menubar): Use FSET.
  
  * nsterm.m (ns_frame_rehighlight): Use FSET.
modified:
  src/ChangeLog
  src/nsmenu.m
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-06 11:16:07 +0000
+++ b/src/ChangeLog     2012-08-06 12:54:54 +0000
@@ -1,3 +1,9 @@
+2012-08-06  Jan Djärv  <address@hidden>
+
+       * nsterm.m (ns_frame_rehighlight): Use FSET.
+
+       * nsmenu.m (ns_update_menubar): Use FSET.
+
 2012-08-06  Dmitry Antipov  <address@hidden>
 
        Separate read and write access to Lisp_Object slots of Lisp_Process.

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2012-08-06 10:24:26 +0000
+++ b/src/nsmenu.m      2012-08-06 12:54:54 +0000
@@ -215,7 +215,7 @@
       if (! NILP (Vlucid_menu_bar_dirty_flag))
        call0 (Qrecompute_lucid_menubar);
       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)));
 
       /* Now ready to go */
       items = FRAME_MENU_BAR_ITEMS (f);

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-08-06 10:24:26 +0000
+++ b/src/nsterm.m      2012-08-06 12:54:54 +0000
@@ -1018,7 +1018,7 @@
            : dpyinfo->x_focus_frame);
       if (!FRAME_LIVE_P (dpyinfo->x_highlight_frame))
         {
-          FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame) = Qnil;
+          FSET (dpyinfo->x_focus_frame, focus_frame, Qnil);
           dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame;
         }
     }