From 054e16686ce0dddadefd8dd9a02ac0950ab8d703 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 6 Aug 2012 14:54:54 +0200 Subject: [PATCH] Use FSET. * nsmenu.m (ns_update_menubar): Use FSET. * nsterm.m (ns_frame_rehighlight): Use FSET. --- src/ChangeLog | 6 ++++++ src/nsmenu.m | 2 +- src/nsterm.m | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index caee8513e3e..146eed20e37 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-08-06 Jan Djärv + + * nsterm.m (ns_frame_rehighlight): Use FSET. + + * nsmenu.m (ns_update_menubar): Use FSET. + 2012-08-06 Dmitry Antipov Separate read and write access to Lisp_Object slots of Lisp_Process. diff --git a/src/nsmenu.m b/src/nsmenu.m index f13c513940f..152127e66c5 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -215,7 +215,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) 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); diff --git a/src/nsterm.m b/src/nsterm.m index 67f3205a897..046ed4d3082 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1018,7 +1018,7 @@ ns_frame_rehighlight (struct frame *frame) : 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; } } -- 2.39.2