From f00af5b1c24515f20f96cfd8d59983ab62fb3f25 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 17 Aug 2012 14:52:15 -0700 Subject: [PATCH] * frame.h (FSET): Remove (Bug#12215). Replace all uses with calls to new setter functions. Use INLINE_HEADER_BEGIN, INLINE_HEADER_END. (FRAME_INLINE): New macro. (fset_buffer_list, fset_buried_buffer_list, fset_condemned_scroll_bars) (fset_current_tool_bar_string, fset_desired_tool_bar_string) (fset_face_alist, fset_focus_frame, fset_icon_name, fset_menu_bar_items) (fset_menu_bar_vector, fset_menu_bar_window, fset_name) (fset_param_alist, fset_root_window, fset_scroll_bars) (fset_selected_window, fset_title, fset_tool_bar_items) (fset_tool_bar_position, fset_tool_bar_window): New functions. * frame.c (FRAME_INLINE): Define to EXTERN_INLINE, so that the corresponding functions are compiled into code. (fset_buffer_predicate, fset_minibuffer_window): New setter functions. --- src/ChangeLog | 16 +++++++ src/buffer.c | 10 ++--- src/dispnew.c | 12 +++--- src/dosfns.c | 2 +- src/frame.c | 63 +++++++++++++++++----------- src/frame.h | 114 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/nsfns.m | 22 +++++----- src/nsmenu.m | 4 +- src/nsterm.m | 2 +- src/w32fns.c | 26 ++++++------ src/w32menu.c | 6 +-- src/w32term.c | 14 +++---- src/window.c | 35 +++++++++------- src/xdisp.c | 8 ++-- src/xfaces.c | 2 +- src/xfns.c | 32 +++++++------- src/xmenu.c | 6 +-- src/xterm.c | 14 +++---- 18 files changed, 264 insertions(+), 124 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7b8bf5e52a..6cb475ef3d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,21 @@ 2012-08-17 Paul Eggert + * frame.h (FSET): Remove (Bug#12215). + Replace all uses with calls to new setter functions. + Use INLINE_HEADER_BEGIN, INLINE_HEADER_END. + (FRAME_INLINE): New macro. + (fset_buffer_list, fset_buried_buffer_list, fset_condemned_scroll_bars) + (fset_current_tool_bar_string, fset_desired_tool_bar_string) + (fset_face_alist, fset_focus_frame, fset_icon_name, fset_menu_bar_items) + (fset_menu_bar_vector, fset_menu_bar_window, fset_name) + (fset_param_alist, fset_root_window, fset_scroll_bars) + (fset_selected_window, fset_title, fset_tool_bar_items) + (fset_tool_bar_position, fset_tool_bar_window): New functions. + * frame.c (FRAME_INLINE): + Define to EXTERN_INLINE, so that the corresponding functions + are compiled into code. + (fset_buffer_predicate, fset_minibuffer_window): New setter functions. + A few more naming-convention fixes for getters and setters. * buffer.c (set_buffer_overlays_before): Move here from buffer.h, and rename from buffer_overlays_set_before. diff --git a/src/buffer.c b/src/buffer.c index 75377abb75..476f2e363b 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1783,8 +1783,8 @@ record_buffer (Lisp_Object buffer) Vinhibit_quit = tem; /* Update buffer list of selected frame. */ - FSET (f, buffer_list, Fcons (buffer, Fdelq (buffer, f->buffer_list))); - FSET (f, buried_buffer_list, Fdelq (buffer, f->buried_buffer_list)); + fset_buffer_list (f, Fcons (buffer, Fdelq (buffer, f->buffer_list))); + fset_buried_buffer_list (f, Fdelq (buffer, f->buried_buffer_list)); /* Run buffer-list-update-hook. */ if (!NILP (Vrun_hooks)) @@ -1821,9 +1821,9 @@ DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal, Vinhibit_quit = tem; /* Update buffer lists of selected frame. */ - FSET (f, buffer_list, Fdelq (buffer, f->buffer_list)); - FSET (f, buried_buffer_list, - Fcons (buffer, Fdelq (buffer, f->buried_buffer_list))); + fset_buffer_list (f, Fdelq (buffer, f->buffer_list)); + fset_buried_buffer_list + (f, Fcons (buffer, Fdelq (buffer, f->buried_buffer_list))); /* Run buffer-list-update-hook. */ if (!NILP (Vrun_hooks)) diff --git a/src/dispnew.c b/src/dispnew.c index 3288faba61..88672934b2 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -2166,7 +2166,7 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f) if (NILP (f->menu_bar_window)) { Lisp_Object frame; - FSET (f, menu_bar_window, make_window ()); + fset_menu_bar_window (f, make_window ()); w = XWINDOW (f->menu_bar_window); XSETFRAME (frame, f); WSET (w, frame, frame); @@ -2194,7 +2194,7 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f) if (NILP (f->tool_bar_window)) { Lisp_Object frame; - FSET (f, tool_bar_window, make_window ()); + fset_tool_bar_window (f, make_window ()); w = XWINDOW (f->tool_bar_window); XSETFRAME (frame, f); WSET (w, frame, frame); @@ -2272,7 +2272,7 @@ free_glyphs (struct frame *f) free_glyph_matrix (w->desired_matrix); free_glyph_matrix (w->current_matrix); w->desired_matrix = w->current_matrix = NULL; - FSET (f, menu_bar_window, Qnil); + fset_menu_bar_window (f, Qnil); } /* Free the tool bar window and its glyph matrices. */ @@ -2282,7 +2282,7 @@ free_glyphs (struct frame *f) free_glyph_matrix (w->desired_matrix); free_glyph_matrix (w->current_matrix); w->desired_matrix = w->current_matrix = NULL; - FSET (f, tool_bar_window, Qnil); + fset_tool_bar_window (f, Qnil); } /* Release frame glyph matrices. Reset fields to zero in @@ -3220,8 +3220,8 @@ update_frame (struct frame *f, int force_p, int inhibit_hairy_id_p) /* Swap tool-bar strings. We swap because we want to reuse strings. */ tem = f->current_tool_bar_string; - FSET (f, current_tool_bar_string, f->desired_tool_bar_string); - FSET (f, desired_tool_bar_string, tem); + fset_current_tool_bar_string (f, f->desired_tool_bar_string); + fset_desired_tool_bar_string (f, tem); } } diff --git a/src/dosfns.c b/src/dosfns.c index e3adf25d79..21676f4b4f 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -473,7 +473,7 @@ x_set_title (struct frame *f, Lisp_Object name) update_mode_lines = 1; - FSET (f, title, name); + fset_title (f, name); if (NILP (name)) name = f->name; diff --git a/src/frame.c b/src/frame.c index f033ac21c2..0871100da2 100644 --- a/src/frame.c +++ b/src/frame.c @@ -19,6 +19,8 @@ along with GNU Emacs. If not, see . */ #include +#define FRAME_INLINE EXTERN_INLINE + #include #include #include @@ -127,6 +129,18 @@ static Lisp_Object Qdelete_frame_functions; static void x_report_frame_params (struct frame *, Lisp_Object *); #endif +/* These setters are used only in this file, so they can be private. */ +static inline void +fset_buffer_predicate (struct frame *f, Lisp_Object val) +{ + f->buffer_predicate = val; +} +static inline void +fset_minibuffer_window (struct frame *f, Lisp_Object val) +{ + f->minibuffer_window = val; +} + static void set_menu_bar_lines_1 (Lisp_Object window, int n) @@ -271,7 +285,7 @@ make_frame (int mini_p) /* Initialize Lisp data. Note that allocate_frame initializes all Lisp data to nil, so do it only for slots which should not be nil. */ - FSET (f, tool_bar_position, Qtop); + fset_tool_bar_position (f, Qtop); /* Initialize non-Lisp data. Note that allocate_frame zeroes out all non-Lisp data, so do it only for slots which should not be zero. @@ -295,13 +309,13 @@ make_frame (int mini_p) WSET (XWINDOW (mini_window), prev, root_window); XWINDOW (mini_window)->mini = 1; WSET (XWINDOW (mini_window), frame, frame); - FSET (f, minibuffer_window, mini_window); + fset_minibuffer_window (f, mini_window); } else { mini_window = Qnil; WSET (XWINDOW (root_window), next, Qnil); - FSET (f, minibuffer_window, Qnil); + fset_minibuffer_window (f, Qnil); } WSET (XWINDOW (root_window), frame, frame); @@ -341,7 +355,7 @@ make_frame (int mini_p) etc. Running Lisp functions at this point surely ends in a SEGV. */ set_window_buffer (root_window, buf, 0, 0); - FSET (f, buffer_list, Fcons (buf, Qnil)); + fset_buffer_list (f, Fcons (buf, Qnil)); } if (mini_p) @@ -354,8 +368,8 @@ make_frame (int mini_p) 0, 0); } - FSET (f, root_window, root_window); - FSET (f, selected_window, root_window); + fset_root_window (f, root_window); + fset_selected_window (f, root_window); /* Make sure this window seems more recently used than a newly-created, never-selected window. */ XWINDOW (f->selected_window)->use_time = ++window_select_count; @@ -404,7 +418,7 @@ make_frame_without_minibuffer (register Lisp_Object mini_window, KBOARD *kb, Lis = XFRAME (KVAR (kb, Vdefault_minibuffer_frame))->minibuffer_window; } - FSET (f, minibuffer_window, mini_window); + fset_minibuffer_window (f, mini_window); /* Make the chosen minibuffer window display the proper minibuffer, unless it is already showing a minibuffer. */ @@ -441,7 +455,8 @@ make_minibuffer_frame (void) Avoid infinite looping on the window chain by marking next pointer as nil. */ - mini_window = FSET (f, minibuffer_window, f->root_window); + mini_window = f->root_window; + fset_minibuffer_window (f, mini_window); XWINDOW (mini_window)->mini = 1; WSET (XWINDOW (mini_window), next, Qnil); WSET (XWINDOW (mini_window), prev, Qnil); @@ -484,7 +499,7 @@ make_initial_frame (void) Vframe_list = Fcons (frame, Vframe_list); tty_frame_count = 1; - FSET (f, name, build_pure_c_string ("F1")); + fset_name (f, build_pure_c_string ("F1")); f->visible = 1; f->async_visible = 1; @@ -525,7 +540,7 @@ make_terminal_frame (struct terminal *terminal) XSETFRAME (frame, f); Vframe_list = Fcons (frame, Vframe_list); - FSET (f, name, make_formatted_string (name, "F%"pMd, ++tty_frame_count)); + fset_name (f, make_formatted_string (name, "F%"pMd, ++tty_frame_count)); f->visible = 1; /* FRAME_SET_VISIBLE wd set frame_garbaged. */ f->async_visible = 1; /* Don't let visible be cleared later. */ @@ -695,7 +710,7 @@ affects all frames on the same terminal device. */) /* Make the frame face alist be frame-specific, so that each frame could change its face definitions independently. */ - FSET (f, face_alist, Fcopy_alist (sf->face_alist)); + fset_face_alist (f, Fcopy_alist (sf->face_alist)); /* Simple Fcopy_alist isn't enough, because we need the contents of the vectors which are the CDRs of associations in face_alist to be copied as well. */ @@ -1282,7 +1297,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) /* Mark all the windows that used to be on FRAME as deleted, and then remove the reference to them. */ delete_all_child_windows (f->root_window); - FSET (f, root_window, Qnil); + fset_root_window (f, Qnil); Vframe_list = Fdelq (frame, Vframe_list); FRAME_SET_VISIBLE (f, 0); @@ -1291,7 +1306,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) garbage collection. The frame object itself may not be garbage collected until much later, because recent_keys and other data structures can still refer to it. */ - FSET (f, menu_bar_vector, Qnil); + fset_menu_bar_vector (f, Qnil); free_font_driver_list (f); xfree (f->namebuf); @@ -1919,7 +1934,7 @@ The redirection lasts until `redirect-frame-focus' is called to change it. */) f = XFRAME (frame); - FSET (f, focus_frame, focus_frame); + fset_focus_frame (f, focus_frame); if (FRAME_TERMINAL (f)->frame_rehighlight_hook) (*FRAME_TERMINAL (f)->frame_rehighlight_hook) (f); @@ -1984,10 +1999,10 @@ frames_discard_buffer (Lisp_Object buffer) FOR_EACH_FRAME (tail, frame) { - FSET (XFRAME (frame), buffer_list, - Fdelq (buffer, XFRAME (frame)->buffer_list)); - FSET (XFRAME (frame), buried_buffer_list, - Fdelq (buffer, XFRAME (frame)->buried_buffer_list)); + fset_buffer_list + (XFRAME (frame), Fdelq (buffer, XFRAME (frame)->buffer_list)); + fset_buried_buffer_list + (XFRAME (frame), Fdelq (buffer, XFRAME (frame)->buried_buffer_list)); } } @@ -2054,7 +2069,7 @@ set_term_frame_name (struct frame *f, Lisp_Object name) error ("Frame names of the form F are usurped by Emacs"); } - FSET (f, name, name); + fset_name (f, name); update_mode_lines = 1; } @@ -2071,7 +2086,7 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) for (; CONSP (val); val = XCDR (val)) if (!NILP (Fbuffer_live_p (XCAR (val)))) list = Fcons (XCAR (val), list); - FSET (f, buffer_list, Fnreverse (list)); + fset_buffer_list (f, Fnreverse (list)); return; } if (EQ (prop, Qburied_buffer_list)) @@ -2080,7 +2095,7 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) for (; CONSP (val); val = XCDR (val)) if (!NILP (Fbuffer_live_p (XCAR (val)))) list = Fcons (XCAR (val), list); - FSET (f, buried_buffer_list, Fnreverse (list)); + fset_buried_buffer_list (f, Fnreverse (list)); return; } @@ -2117,7 +2132,7 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) /* Update the frame parameter alist. */ old_alist_elt = Fassq (prop, f->param_alist); if (EQ (old_alist_elt, Qnil)) - FSET (f, param_alist, Fcons (Fcons (prop, val), f->param_alist)); + fset_param_alist (f, Fcons (Fcons (prop, val), f->param_alist)); else Fsetcdr (old_alist_elt, val); @@ -2125,7 +2140,7 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) in addition to the alist. */ if (EQ (prop, Qbuffer_predicate)) - FSET (f, buffer_predicate, val); + fset_buffer_predicate (f, val); if (! FRAME_WINDOW_P (f)) { @@ -2145,7 +2160,7 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) error ("Can't change the surrogate minibuffer of a frame with its own minibuffer"); /* Install the chosen minibuffer window, with proper buffer. */ - FSET (f, minibuffer_window, val); + fset_minibuffer_window (f, val); } } diff --git a/src/frame.h b/src/frame.h index e07974fb4d..92fbda42c7 100644 --- a/src/frame.h +++ b/src/frame.h @@ -25,6 +25,11 @@ along with GNU Emacs. If not, see . */ #include "dispextern.h" +INLINE_HEADER_BEGIN +#ifndef FRAME_INLINE +# define FRAME_INLINE INLINE +#endif + /* Miscellanea. */ @@ -80,10 +85,6 @@ struct terminal; struct font_driver_list; -/* Most code should use this macro to set Lisp field in struct frame. */ - -#define FSET(f, field, value) ((f)->field = (value)) - struct frame { struct vectorlike_header header; @@ -499,6 +500,109 @@ struct frame unsigned long foreground_pixel; }; +/* Most code should use these functions to set Lisp fields in struct frame. */ + +FRAME_INLINE void +fset_buffer_list (struct frame *f, Lisp_Object val) +{ + f->buffer_list = val; +} +FRAME_INLINE void +fset_buried_buffer_list (struct frame *f, Lisp_Object val) +{ + f->buried_buffer_list = val; +} +FRAME_INLINE void +fset_condemned_scroll_bars (struct frame *f, Lisp_Object val) +{ + f->condemned_scroll_bars = val; +} +FRAME_INLINE void +fset_current_tool_bar_string (struct frame *f, Lisp_Object val) +{ + f->current_tool_bar_string = val; +} +FRAME_INLINE void +fset_desired_tool_bar_string (struct frame *f, Lisp_Object val) +{ + f->desired_tool_bar_string = val; +} +FRAME_INLINE void +fset_face_alist (struct frame *f, Lisp_Object val) +{ + f->face_alist = val; +} +FRAME_INLINE void +fset_focus_frame (struct frame *f, Lisp_Object val) +{ + f->focus_frame = val; +} +FRAME_INLINE void +fset_icon_name (struct frame *f, Lisp_Object val) +{ + f->icon_name = val; +} +FRAME_INLINE void +fset_menu_bar_items (struct frame *f, Lisp_Object val) +{ + f->menu_bar_items = val; +} +FRAME_INLINE void +fset_menu_bar_vector (struct frame *f, Lisp_Object val) +{ + f->menu_bar_vector = val; +} +FRAME_INLINE void +fset_menu_bar_window (struct frame *f, Lisp_Object val) +{ + f->menu_bar_window = val; +} +FRAME_INLINE void +fset_name (struct frame *f, Lisp_Object val) +{ + f->name = val; +} +FRAME_INLINE void +fset_param_alist (struct frame *f, Lisp_Object val) +{ + f->param_alist = val; +} +FRAME_INLINE void +fset_root_window (struct frame *f, Lisp_Object val) +{ + f->root_window = val; +} +FRAME_INLINE void +fset_scroll_bars (struct frame *f, Lisp_Object val) +{ + f->scroll_bars = val; +} +FRAME_INLINE void +fset_selected_window (struct frame *f, Lisp_Object val) +{ + f->selected_window = val; +} +FRAME_INLINE void +fset_title (struct frame *f, Lisp_Object val) +{ + f->title = val; +} +FRAME_INLINE void +fset_tool_bar_items (struct frame *f, Lisp_Object val) +{ + f->tool_bar_items = val; +} +FRAME_INLINE void +fset_tool_bar_position (struct frame *f, Lisp_Object val) +{ + f->tool_bar_position = val; +} +FRAME_INLINE void +fset_tool_bar_window (struct frame *f, Lisp_Object val) +{ + f->tool_bar_window = val; +} + #define FRAME_KBOARD(f) ((f)->terminal->kboard) /* Return a pointer to the image cache of frame F. */ @@ -1146,4 +1250,6 @@ extern void set_frame_menubar (FRAME_PTR, int, int); #endif /* HAVE_WINDOW_SYSTEM */ +INLINE_HEADER_END + #endif /* not EMACS_FRAME_H */ diff --git a/src/nsfns.m b/src/nsfns.m index 1b39f0257a..abfcb71cbf 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -447,7 +447,7 @@ x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) return; - FSET (f, icon_name, arg); + fset_icon_name (f, arg); if (NILP (arg)) { @@ -539,7 +539,7 @@ ns_set_name (struct frame *f, Lisp_Object name, int explicit) if (! NILP (Fstring_equal (name, f->name))) return; - FSET (f, name, name); + fset_name (f, name); /* title overrides explicit name */ if (! NILP (f->title)) @@ -590,7 +590,7 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name) update_mode_lines = 1; - FSET (f, title, name); + fset_title (f, name); if (NILP (name)) name = f->name; @@ -676,7 +676,7 @@ ns_set_name_as_filename (struct frame *f) [[view window] setRepresentedFilename: fstr]; [[view window] setTitle: str]; - FSET (f, name, name); + fset_name (f, name); } [pool release]; @@ -1204,11 +1204,11 @@ This function is an internal primitive--use `make-frame' instead. */) FRAME_FONTSET (f) = -1; - FSET (f, icon_name, x_get_arg (dpyinfo, parms, Qicon_name, - "iconName", "Title", - RES_TYPE_STRING)); + fset_icon_name (f, x_get_arg (dpyinfo, parms, Qicon_name, + "iconName", "Title", + RES_TYPE_STRING)); if (! STRINGP (f->icon_name)) - FSET (f, icon_name, Qnil); + fset_icon_name (f, Qnil); FRAME_NS_DISPLAY_INFO (f) = dpyinfo; @@ -1231,12 +1231,12 @@ This function is an internal primitive--use `make-frame' instead. */) be set. */ if (EQ (name, Qunbound) || NILP (name) || ! STRINGP (name)) { - FSET (f, name, build_string ([ns_app_name UTF8String])); + fset_name (f, build_string ([ns_app_name UTF8String])); f->explicit_name = 0; } else { - FSET (f, name, name); + fset_name (f, name); f->explicit_name = 1; specbind (Qx_resource_name, name); } @@ -1397,7 +1397,7 @@ This function is an internal primitive--use `make-frame' instead. */) by x_get_arg and friends, now go in the misc. alist of the frame. */ for (tem = parms; CONSP (tem); tem = XCDR (tem)) if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) - FSET (f, param_alist, Fcons (XCAR (tem), f->param_alist)); + fset_param_alist (f, Fcons (XCAR (tem), f->param_alist)); UNGCPRO; diff --git a/src/nsmenu.m b/src/nsmenu.m index 657b930694..e8a0b43a01 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -214,7 +214,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); - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); /* Now ready to go */ items = FRAME_MENU_BAR_ITEMS (f); @@ -340,7 +340,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) } /* The menu items are different, so store them in the frame */ /* FIXME: this is not correct for single-submenu case */ - FSET (f, menu_bar_vector, menu_items); + fset_menu_bar_vector (f, menu_items); f->menu_bar_items_used = menu_items_used; /* Calls restore_menu_items, etc., as they were outside */ diff --git a/src/nsterm.m b/src/nsterm.m index a628a248c7..137ad299dd 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1032,7 +1032,7 @@ ns_frame_rehighlight (struct frame *frame) : dpyinfo->x_focus_frame); if (!FRAME_LIVE_P (dpyinfo->x_highlight_frame)) { - FSET (dpyinfo->x_focus_frame, focus_frame, Qnil); + fset_focus_frame (dpyinfo->x_focus_frame, Qnil); dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame; } } diff --git a/src/w32fns.c b/src/w32fns.c index 7779f03210..3f84823c36 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1490,7 +1490,7 @@ x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) else if (!NILP (arg) || NILP (oldval)) return; - FSET (f, icon_name, arg); + fset_icon_name (f, arg); #if 0 if (f->output_data.w32->icon_bitmap != 0) @@ -1686,7 +1686,7 @@ x_set_name (struct frame *f, Lisp_Object name, int explicit) if (! NILP (Fstring_equal (name, f->name))) return; - FSET (f, name, name); + fset_name (f, name); /* For setting the frame title, the title parameter should override the name parameter. */ @@ -1734,7 +1734,7 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name) update_mode_lines = 1; - FSET (f, title, name); + fset_title (f, name); if (NILP (name)) name = f->name; @@ -3925,7 +3925,7 @@ w32_window (struct frame *f, long window_prompting, int minibuffer_only) f->explicit_name = 0; name = f->name; - FSET (f, name, Qnil); + fset_name (f, Qnil); x_set_name (f, name, explicit); } @@ -4174,11 +4174,11 @@ This function is an internal primitive--use `make-frame' instead. */) f->output_data.w32 = xzalloc (sizeof (struct w32_output)); FRAME_FONTSET (f) = -1; - FSET (f, icon_name, - x_get_arg (dpyinfo, parameters, Qicon_name, "iconName", "Title", + fset_icon_name + (f, x_get_arg (dpyinfo, parameters, Qicon_name, "iconName", "Title", RES_TYPE_STRING)); if (! STRINGP (f->icon_name)) - FSET (f, icon_name, Qnil); + fset_icon_name (f, Qnil); /* FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */ @@ -4207,12 +4207,12 @@ This function is an internal primitive--use `make-frame' instead. */) be set. */ if (EQ (name, Qunbound) || NILP (name)) { - FSET (f, name, build_string (dpyinfo->w32_id_name)); + fset_name (f, build_string (dpyinfo->w32_id_name)); f->explicit_name = 0; } else { - FSET (f, name, name); + fset_name (f, name); f->explicit_name = 1; /* use the frame's title when getting resources for this frame. */ specbind (Qx_resource_name, name); @@ -4387,7 +4387,7 @@ This function is an internal primitive--use `make-frame' instead. */) by x_get_arg and friends, now go in the misc. alist of the frame. */ for (tem = parameters; CONSP (tem); tem = XCDR (tem)) if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) - FSET (f, param_alist, Fcons (XCAR (tem), f->param_alist)); + fset_param_alist (f, Fcons (XCAR (tem), f->param_alist)); UNGCPRO; @@ -5261,7 +5261,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, f->output_data.w32 = xzalloc (sizeof (struct w32_output)); FRAME_FONTSET (f) = -1; - FSET (f, icon_name, Qnil); + fset_icon_name (f, Qnil); #ifdef GLYPH_DEBUG image_cache_refcount = @@ -5276,12 +5276,12 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, be set. */ if (EQ (name, Qunbound) || NILP (name)) { - FSET (f, name, build_string (dpyinfo->w32_id_name)); + fset_name (f, build_string (dpyinfo->w32_id_name)); f->explicit_name = 0; } else { - FSET (f, name, name); + fset_name (f, name); f->explicit_name = 1; /* use the frame's title when getting resources for this frame. */ specbind (Qx_resource_name, name); diff --git a/src/w32menu.c b/src/w32menu.c index 02302c2d59..3aa4c8bc96 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); - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); items = FRAME_MENU_BAR_ITEMS (f); @@ -500,7 +500,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) return; } - FSET (f, menu_bar_vector, menu_items); + fset_menu_bar_vector (f, menu_items); f->menu_bar_items_used = menu_items_used; /* This undoes save_menu_items. */ @@ -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. */ - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); set_frame_menubar (f, 1, 1); } diff --git a/src/w32term.c b/src/w32term.c index 7da9433d3f..a74dfbc3bd 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2972,7 +2972,7 @@ x_frame_rehighlight (struct w32_display_info *dpyinfo) : dpyinfo->w32_focus_frame); if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame)) { - FSET (dpyinfo->w32_focus_frame, focus_frame, Qnil); + fset_focus_frame (dpyinfo->w32_focus_frame, Qnil); dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame; } } @@ -3646,7 +3646,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height) bar->next = FRAME_SCROLL_BARS (f); bar->prev = Qnil; XSETVECTOR (barobj, bar); - FSET (f, scroll_bars, barobj); + fset_scroll_bars (f, barobj); if (! NILP (bar->next)) XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); @@ -3832,12 +3832,12 @@ w32_condemn_scroll_bars (FRAME_PTR frame) { Lisp_Object bar; bar = FRAME_SCROLL_BARS (frame); - FSET (frame, scroll_bars, XSCROLL_BAR (bar)->next); + fset_scroll_bars (frame, XSCROLL_BAR (bar)->next); XSCROLL_BAR (bar)->next = FRAME_CONDEMNED_SCROLL_BARS (frame); XSCROLL_BAR (bar)->prev = Qnil; if (! NILP (FRAME_CONDEMNED_SCROLL_BARS (frame))) XSCROLL_BAR (FRAME_CONDEMNED_SCROLL_BARS (frame))->prev = bar; - FSET (frame, condemned_scroll_bars, bar); + fset_condemned_scroll_bars (frame, bar); } } @@ -3869,7 +3869,7 @@ w32_redeem_scroll_bar (struct window *window) return; else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f), window->vertical_scroll_bar)) - FSET (f, condemned_scroll_bars, bar->next); + fset_condemned_scroll_bars (f, bar->next); else /* If its prev pointer is nil, it must be at the front of one or the other! */ @@ -3884,7 +3884,7 @@ w32_redeem_scroll_bar (struct window *window) bar->next = FRAME_SCROLL_BARS (f); bar->prev = Qnil; XSETVECTOR (barobj, bar); - FSET (f, scroll_bars, barobj); + fset_scroll_bars (f, barobj); if (! NILP (bar->next)) XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); } @@ -3901,7 +3901,7 @@ w32_judge_scroll_bars (FRAME_PTR f) /* Clear out the condemned list now so we won't try to process any more events on the hapless scroll bars. */ - FSET (f, condemned_scroll_bars, Qnil); + fset_condemned_scroll_bars (f, Qnil); for (; ! NILP (bar); bar = next) { diff --git a/src/window.c b/src/window.c index 7874105df1..140b925ed6 100644 --- a/src/window.c +++ b/src/window.c @@ -322,7 +322,10 @@ Return WINDOW. */) if (EQ (frame, selected_frame)) return Fselect_window (window, norecord); else - return FSET (XFRAME (frame), selected_window, window); + { + fset_selected_window (XFRAME (frame), window); + return window; + } } DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0, @@ -365,7 +368,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap) sf = SELECTED_FRAME (); if (XFRAME (WINDOW_FRAME (w)) != sf) { - FSET (XFRAME (WINDOW_FRAME (w)), selected_window, window); + fset_selected_window (XFRAME (WINDOW_FRAME (w)), window); /* Use this rather than Fhandle_switch_frame so that FRAME_FOCUS_FRAME is moved appropriately as we move around in the state where a minibuffer in a separate @@ -376,7 +379,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap) return window; } else - FSET (sf, selected_window, window); + fset_selected_window (sf, window); /* Store the current buffer's actual point into the old selected window. It belongs to that window, @@ -1863,7 +1866,7 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag) /* If OLD is its frame's root window, then NEW is the new root window for that frame. */ if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) - FSET (XFRAME (o->frame), root_window, new); + fset_root_window (XFRAME (o->frame), new); if (setflag) { @@ -2146,7 +2149,7 @@ decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object /* ALL_FRAMES nil doesn't specify which frames to include. */ if (NILP (*all_frames)) - *all_frames + *all_frames = (!EQ (*minibuf, Qlambda) ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) : Qnil); @@ -2659,7 +2662,7 @@ window-start value is reasonable when this function is called. */) if (EQ (selected_frame, w->frame)) Fselect_window (window, Qnil); else - FSET (f, selected_window, window); + fset_selected_window (f, window); } } else @@ -2689,7 +2692,7 @@ window-start value is reasonable when this function is called. */) if (EQ (selected_frame, w->frame)) Fselect_window (swindow, Qnil); else - FSET (f, selected_window, swindow); + fset_selected_window (f, swindow); } } @@ -2741,8 +2744,8 @@ window-start value is reasonable when this function is called. */) if (!resize_failed) { WSET (w, left_col, r->left_col); - XSETINT (delta, XINT (r->total_cols) - - XINT (w->total_cols)); + XSETINT (delta, + XINT (r->total_cols) - XINT (w->total_cols)); WSET (w, left_col, r->left_col); resize_root_window (window, delta, Qt, Qnil); if (window_resize_check (w, 1)) @@ -2915,7 +2918,7 @@ adjust_window_margins (struct window *w) if (WINDOW_LEFT_MARGIN_COLS (w) > 0) { WSET (w, left_margin_cols, make_number (margin_cols / 2)); - WSET (w, right_margin_cols, make_number (margin_cols / 2)); + WSET (w, right_margin_cols, make_number (margin_cols / 2)); } else WSET (w, right_margin_cols, make_number (margin_cols)); @@ -3612,7 +3615,7 @@ resize_frame_windows (struct frame *f, int size, int horflag) else { /* old_size is the old size of the frame's root window. */ - int old_size = XFASTINT (horflag ? r->total_cols + int old_size = XFASTINT (horflag ? r->total_cols : r->total_lines); Lisp_Object delta; @@ -4000,7 +4003,7 @@ Signal an error when WINDOW is the only window on its frame. */) if (EQ (FRAME_SELECTED_WINDOW (f), selected_window)) Fselect_window (new_selected_window, Qt); else - FSET (f, selected_window, new_selected_window); + fset_selected_window (f, new_selected_window); UNBLOCK_INPUT; @@ -4014,7 +4017,7 @@ Signal an error when WINDOW is the only window on its frame. */) if (EQ (FRAME_SELECTED_WINDOW (f), selected_window)) Fselect_window (new_selected_window, Qnil); else - FSET (f, selected_window, new_selected_window); + fset_selected_window (f, new_selected_window); } else UNBLOCK_INPUT; @@ -5542,7 +5545,7 @@ the return value is nil. Otherwise the value is t. */) WSET (w, next, Qnil); if (!NILP (p->parent)) - WSET (w, parent, SAVED_WINDOW_N + WSET (w, parent, SAVED_WINDOW_N (saved_windows, XFASTINT (p->parent))->window); else WSET (w, parent, Qnil); @@ -5650,7 +5653,7 @@ the return value is nil. Otherwise the value is t. */) set_marker_restricted (w->start, make_number (0), w->buffer); if (XMARKER (w->pointm)->buffer == 0) - set_marker_restricted_both + set_marker_restricted_both (w->pointm, w->buffer, BUF_PT (XBUFFER (w->buffer)), BUF_PT_BYTE (XBUFFER (w->buffer))); @@ -5690,7 +5693,7 @@ the return value is nil. Otherwise the value is t. */) } } - FSET (f, root_window, data->root_window); + fset_root_window (f, data->root_window); /* Arrange *not* to restore point in the buffer that was current when the window configuration was saved. */ if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)) diff --git a/src/xdisp.c b/src/xdisp.c index 4cd9560604..ab4375d247 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11274,7 +11274,7 @@ update_menu_bar (struct frame *f, int save_match_data, int hooks_run) } XSETFRAME (Vmenu_updating_frame, f); - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); /* Redisplay the menu bar in case we changed it. */ #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ @@ -11487,7 +11487,7 @@ update_tool_bar (struct frame *f, int save_match_data) may access f->tool_bar_items. Make sure we update both variables within BLOCK_INPUT so no such event interrupts. */ BLOCK_INPUT; - FSET (f, tool_bar_items, new_tool_bar); + fset_tool_bar_items (f, new_tool_bar); f->n_tool_bar_items = new_n_tool_bar; w->update_mode_line = 1; UNBLOCK_INPUT; @@ -11529,8 +11529,8 @@ build_desired_tool_bar_string (struct frame *f) /* Reuse f->desired_tool_bar_string, if possible. */ if (size < size_needed || NILP (f->desired_tool_bar_string)) - FSET (f, desired_tool_bar_string, - Fmake_string (make_number (size_needed), make_number (' '))); + fset_desired_tool_bar_string + (f, Fmake_string (make_number (size_needed), make_number (' '))); else { props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); diff --git a/src/xfaces.c b/src/xfaces.c index 8c6542ee72..46121d6660 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -2695,7 +2695,7 @@ Value is a vector of face attributes. */) lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), Qunspecified); ASET (lface, 0, Qface); - FSET (f, face_alist, Fcons (Fcons (face, lface), f->face_alist)); + fset_face_alist (f, Fcons (Fcons (face, lface), f->face_alist)); } else for (i = 1; i < LFACE_VECTOR_SIZE; ++i) diff --git a/src/xfns.c b/src/xfns.c index a9d22e7d3c..7960a42709 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -658,7 +658,7 @@ x_set_tool_bar_position (struct frame *f, #ifdef USE_GTK if (xg_change_toolbar_position (f, new_value)) - FSET (f, tool_bar_position, new_value); + fset_tool_bar_position (f, new_value); #endif } @@ -1145,7 +1145,7 @@ x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) else if (!NILP (arg) || NILP (oldval)) return; - FSET (f, icon_name, arg); + fset_icon_name (f, arg); if (f->output_data.x->icon_bitmap != 0) return; @@ -1636,7 +1636,7 @@ x_set_name (struct frame *f, Lisp_Object name, int explicit) if (! NILP (Fstring_equal (name, f->name))) return; - FSET (f, name, name); + fset_name (f, name); /* For setting the frame title, the title parameter should override the name parameter. */ @@ -1676,7 +1676,7 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name) update_mode_lines = 1; - FSET (f, title, name); + fset_title (f, name); if (NILP (name)) name = f->name; @@ -2565,7 +2565,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only) f->explicit_name = 0; name = f->name; - FSET (f, name, Qnil); + fset_name (f, Qnil); x_set_name (f, name, explicit); } @@ -2708,7 +2708,7 @@ x_window (struct frame *f) f->explicit_name = 0; name = f->name; - FSET (f, name, Qnil); + fset_name (f, Qnil); x_set_name (f, name, explicit); } @@ -3128,11 +3128,11 @@ This function is an internal primitive--use `make-frame' instead. */) f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; #endif /* USE_TOOLKIT_SCROLL_BARS */ - FSET (f, icon_name, - x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", - RES_TYPE_STRING)); + fset_icon_name (f, + x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", + RES_TYPE_STRING)); if (! STRINGP (f->icon_name)) - FSET (f, icon_name, Qnil); + fset_icon_name (f, Qnil); FRAME_X_DISPLAY_INFO (f) = dpyinfo; @@ -3189,12 +3189,12 @@ This function is an internal primitive--use `make-frame' instead. */) be set. */ if (EQ (name, Qunbound) || NILP (name)) { - FSET (f, name, build_string (dpyinfo->x_id_name)); + fset_name (f, build_string (dpyinfo->x_id_name)); f->explicit_name = 0; } else { - FSET (f, name, name); + fset_name (f, name); f->explicit_name = 1; /* use the frame's title when getting resources for this frame. */ specbind (Qx_resource_name, name); @@ -3461,7 +3461,7 @@ This function is an internal primitive--use `make-frame' instead. */) by x_get_arg and friends, now go in the misc. alist of the frame. */ for (tem = parms; CONSP (tem); tem = XCDR (tem)) if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) - FSET (f, param_alist, Fcons (XCAR (tem), f->param_alist)); + fset_param_alist (f, Fcons (XCAR (tem), f->param_alist)); UNGCPRO; @@ -4616,7 +4616,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; #endif /* USE_TOOLKIT_SCROLL_BARS */ - FSET (f, icon_name, Qnil); + fset_icon_name (f, Qnil); FRAME_X_DISPLAY_INFO (f) = dpyinfo; f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; f->output_data.x->explicit_parent = 0; @@ -4658,12 +4658,12 @@ x_create_tip_frame (struct x_display_info *dpyinfo, be set. */ if (EQ (name, Qunbound) || NILP (name)) { - FSET (f, name, build_string (dpyinfo->x_id_name)); + fset_name (f, build_string (dpyinfo->x_id_name)); f->explicit_name = 0; } else { - FSET (f, name, name); + fset_name (f, name); f->explicit_name = 1; /* use the frame's title when getting resources for this frame. */ specbind (Qx_resource_name, name); diff --git a/src/xmenu.c b/src/xmenu.c index ab790094f8..54a7849218 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1008,7 +1008,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) if (! NILP (Vlucid_menu_bar_dirty_flag)) call0 (Qrecompute_lucid_menubar); safe_run_hooks (Qmenu_bar_update_hook); - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); items = FRAME_MENU_BAR_ITEMS (f); @@ -1100,7 +1100,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) } /* The menu items are different, so store them in the frame. */ - FSET (f, menu_bar_vector, menu_items); + fset_menu_bar_vector (f, menu_items); f->menu_bar_items_used = menu_items_used; /* This undoes save_menu_items. */ @@ -1283,7 +1283,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. */ - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); set_frame_menubar (f, 1, 1); } diff --git a/src/xterm.c b/src/xterm.c index b1a73d0799..715e3664ec 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -3584,7 +3584,7 @@ x_frame_rehighlight (struct x_display_info *dpyinfo) : dpyinfo->x_focus_frame); if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame)) { - FSET (dpyinfo->x_focus_frame, focus_frame, Qnil); + fset_focus_frame (dpyinfo->x_focus_frame, Qnil); dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame; } } @@ -5018,7 +5018,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height) bar->next = FRAME_SCROLL_BARS (f); bar->prev = Qnil; XSETVECTOR (barobj, bar); - FSET (f, scroll_bars, barobj); + fset_scroll_bars (f, barobj); if (!NILP (bar->next)) XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); @@ -5419,12 +5419,12 @@ XTcondemn_scroll_bars (FRAME_PTR frame) { Lisp_Object bar; bar = FRAME_SCROLL_BARS (frame); - FSET (frame, scroll_bars, XSCROLL_BAR (bar)->next); + fset_scroll_bars (frame, XSCROLL_BAR (bar)->next); XSCROLL_BAR (bar)->next = FRAME_CONDEMNED_SCROLL_BARS (frame); XSCROLL_BAR (bar)->prev = Qnil; if (! NILP (FRAME_CONDEMNED_SCROLL_BARS (frame))) XSCROLL_BAR (FRAME_CONDEMNED_SCROLL_BARS (frame))->prev = bar; - FSET (frame, condemned_scroll_bars, bar); + fset_condemned_scroll_bars (frame, bar); } } @@ -5456,7 +5456,7 @@ XTredeem_scroll_bar (struct window *window) return; else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f), window->vertical_scroll_bar)) - FSET (f, condemned_scroll_bars, bar->next); + fset_condemned_scroll_bars (f, bar->next); else /* If its prev pointer is nil, it must be at the front of one or the other! */ @@ -5471,7 +5471,7 @@ XTredeem_scroll_bar (struct window *window) bar->next = FRAME_SCROLL_BARS (f); bar->prev = Qnil; XSETVECTOR (barobj, bar); - FSET (f, scroll_bars, barobj); + fset_scroll_bars (f, barobj); if (! NILP (bar->next)) XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); } @@ -5488,7 +5488,7 @@ XTjudge_scroll_bars (FRAME_PTR f) /* Clear out the condemned list now so we won't try to process any more events on the hapless scroll bars. */ - FSET (f, condemned_scroll_bars, Qnil); + fset_condemned_scroll_bars (f, Qnil); for (; ! NILP (bar); bar = next) { -- 2.20.1