If you want to verify the syntax of a toolbar description list as a
whole, use `check-valid-instantiator' with a specifier type of 'toolbar.
*/
- (button, no_error))
+ (button, noerror))
{
Lisp_Object *elt, glyphs, value;
int len;
- Error_behavior errb = decode_error_behavior_flag (no_error);
+ Error_behavior errb = decode_error_behavior_flag (noerror);
if (!VECTORP (button))
CTB_ERROR ("toolbar button descriptors must be vectors");
set_specifier_caching (Vdefault_toolbar,
offsetof (struct window, default_toolbar),
default_toolbar_specs_changed,
- 0, 0);
+ 0, 0, 0);
DEFVAR_SPECIFIER ("top-toolbar",
&Vtoolbar[TOP_TOOLBAR] /*
set_specifier_caching (Vtoolbar[TOP_TOOLBAR],
offsetof (struct window, toolbar[TOP_TOOLBAR]),
toolbar_specs_changed,
- 0, 0);
+ 0, 0, 0);
DEFVAR_SPECIFIER ("bottom-toolbar",
&Vtoolbar[BOTTOM_TOOLBAR] /*
set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR],
offsetof (struct window, toolbar[BOTTOM_TOOLBAR]),
toolbar_specs_changed,
- 0, 0);
+ 0, 0, 0);
DEFVAR_SPECIFIER ("left-toolbar",
&Vtoolbar[LEFT_TOOLBAR] /*
set_specifier_caching (Vtoolbar[LEFT_TOOLBAR],
offsetof (struct window, toolbar[LEFT_TOOLBAR]),
toolbar_specs_changed,
- 0, 0);
+ 0, 0, 0);
DEFVAR_SPECIFIER ("right-toolbar",
&Vtoolbar[RIGHT_TOOLBAR] /*
set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR],
offsetof (struct window, toolbar[RIGHT_TOOLBAR]),
toolbar_specs_changed,
- 0, 0);
+ 0, 0, 0);
/* initially, top inherits from default; this can be
changed with `set-default-toolbar-position'. */
offsetof (struct window, default_toolbar_height),
default_toolbar_size_changed_in_window,
offsetof (struct frame, default_toolbar_height),
- default_toolbar_size_changed_in_frame);
+ default_toolbar_size_changed_in_frame, 0);
DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /*
*Width of the default toolbar, if it's oriented vertically.
offsetof (struct window, default_toolbar_width),
default_toolbar_size_changed_in_window,
offsetof (struct frame, default_toolbar_width),
- default_toolbar_size_changed_in_frame);
+ default_toolbar_size_changed_in_frame, 0);
DEFVAR_SPECIFIER ("top-toolbar-height",
&Vtoolbar_size[TOP_TOOLBAR] /*
offsetof (struct window, toolbar_size[TOP_TOOLBAR]),
toolbar_geometry_changed_in_window,
offsetof (struct frame, toolbar_size[TOP_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("bottom-toolbar-height",
&Vtoolbar_size[BOTTOM_TOOLBAR] /*
offsetof (struct window, toolbar_size[BOTTOM_TOOLBAR]),
toolbar_geometry_changed_in_window,
offsetof (struct frame, toolbar_size[BOTTOM_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("left-toolbar-width",
&Vtoolbar_size[LEFT_TOOLBAR] /*
offsetof (struct window, toolbar_size[LEFT_TOOLBAR]),
toolbar_geometry_changed_in_window,
offsetof (struct frame, toolbar_size[LEFT_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("right-toolbar-width",
&Vtoolbar_size[RIGHT_TOOLBAR] /*
offsetof (struct window, toolbar_size[RIGHT_TOOLBAR]),
toolbar_geometry_changed_in_window,
offsetof (struct frame, toolbar_size[RIGHT_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
fb = Qnil;
#ifdef HAVE_TTY
offsetof (struct window, default_toolbar_border_width),
default_toolbar_border_width_changed_in_window,
offsetof (struct frame, default_toolbar_border_width),
- default_toolbar_border_width_changed_in_frame);
+ default_toolbar_border_width_changed_in_frame, 0);
DEFVAR_SPECIFIER ("top-toolbar-border-width",
&Vtoolbar_border_width[TOP_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_border_width[TOP_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("bottom-toolbar-border-width",
&Vtoolbar_border_width[BOTTOM_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_border_width[BOTTOM_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("left-toolbar-border-width",
&Vtoolbar_border_width[LEFT_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_border_width[LEFT_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("right-toolbar-border-width",
&Vtoolbar_border_width[RIGHT_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_border_width[RIGHT_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
fb = Qnil;
#ifdef HAVE_TTY
offsetof (struct window, default_toolbar_visible_p),
default_toolbar_visible_p_changed_in_window,
offsetof (struct frame, default_toolbar_visible_p),
- default_toolbar_visible_p_changed_in_frame);
+ default_toolbar_visible_p_changed_in_frame, 0);
DEFVAR_SPECIFIER ("top-toolbar-visible-p",
&Vtoolbar_visible_p[TOP_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_visible_p[TOP_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("bottom-toolbar-visible-p",
&Vtoolbar_visible_p[BOTTOM_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_visible_p[BOTTOM_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("left-toolbar-visible-p",
&Vtoolbar_visible_p[LEFT_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_visible_p[LEFT_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
DEFVAR_SPECIFIER ("right-toolbar-visible-p",
&Vtoolbar_visible_p[RIGHT_TOOLBAR] /*
toolbar_geometry_changed_in_window,
offsetof (struct frame,
toolbar_visible_p[RIGHT_TOOLBAR]),
- frame_size_slipped);
+ frame_size_slipped, 0);
/* initially, top inherits from default; this can be
changed with `set-default-toolbar-position'. */
set_specifier_caching (Vtoolbar_buttons_captioned_p,
offsetof (struct window, toolbar_buttons_captioned_p),
toolbar_buttons_captioned_p_changed,
- 0, 0);
+ 0, 0, 0);
set_specifier_fallback (Vtoolbar_buttons_captioned_p,
list1 (Fcons (Qnil, Qt)));
}