Commit 04355cb5 authored by Paul Eggert's avatar Paul Eggert

* src/lisp.h (LISP_INITIALLY_ZERO): Remove.

All uses replaced by LISPSYM_INITIALLY.
parent fccd7d3c
......@@ -508,7 +508,7 @@ static int ftfont_variation_glyphs (struct font *, int c,
struct font_driver ftfont_driver =
{
LISP_INITIALLY_ZERO, /* Qfreetype */
LISPSYM_INITIALLY (Qfreetype),
0, /* case insensitive */
ftfont_get_cache,
ftfont_list,
......@@ -2799,6 +2799,5 @@ syms_of_ftfont (void)
staticpro (&ft_face_cache);
ft_face_cache = Qnil;
ftfont_driver.type = Qfreetype;
register_font_driver (&ftfont_driver, NULL);
}
......@@ -551,8 +551,6 @@ typedef EMACS_INT Lisp_Object;
#define LISP_INITIALLY(i) (i)
enum CHECK_LISP_OBJECT_TYPE { CHECK_LISP_OBJECT_TYPE = false };
#endif /* CHECK_LISP_OBJECT_TYPE */
#define LISP_INITIALLY_ZERO LISP_INITIALLY (0)
/* Forward declarations. */
......
......@@ -1665,7 +1665,7 @@ static int macfont_variation_glyphs (struct font *, int c,
static struct font_driver macfont_driver =
{
LISP_INITIALLY_ZERO, /* Qmac_ct */
LISPSYM_INITIALLY (Qmac_ct),
0, /* case insensitive */
macfont_get_cache,
macfont_list,
......@@ -4059,7 +4059,6 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
{
/* Core Text, for macOS. */
DEFSYM (Qmac_ct, "mac-ct");
macfont_driver.type = Qmac_ct;
register_font_driver (&macfont_driver, NULL);
/* The font property key specifying the font design destination. The
......
......@@ -626,7 +626,7 @@ static int nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
struct font_driver nsfont_driver =
{
0, /* Qns */
LISPSYM_INITIALLY (Qns),
1, /* case sensitive */
nsfont_get_cache,
nsfont_list,
......@@ -1524,7 +1524,6 @@ - (void)setIntAttribute: (NSInteger)attributeTag value: (NSInteger)val
void
syms_of_nsfont (void)
{
nsfont_driver.type = Qns;
register_font_driver (&nsfont_driver, NULL);
DEFSYM (Qcondensed, "condensed");
DEFSYM (Qexpanded, "expanded");
......
......@@ -2535,7 +2535,7 @@ w32font_filter_properties (Lisp_Object font, Lisp_Object alist)
struct font_driver w32font_driver =
{
LISP_INITIALLY_ZERO, /* Qgdi */
LISPSYM_INITIALLY (Qgdi),
false, /* case insensitive */
w32font_get_cache,
w32font_list,
......@@ -2746,7 +2746,6 @@ versions of Windows) characters. */);
defsubr (&Sx_select_font);
w32font_driver.type = Qgdi;
register_font_driver (&w32font_driver, NULL);
}
......
......@@ -1135,7 +1135,7 @@ otf_features (HDC context, const char *table)
struct font_driver uniscribe_font_driver =
{
LISP_INITIALLY_ZERO, /* Quniscribe */
LISPSYM_INITIALLY (Quniscribe),
0, /* case insensitive */
w32font_get_cache,
uniscribe_list,
......@@ -1182,7 +1182,6 @@ syms_of_w32uniscribe (void)
if (!uniscribe)
return;
uniscribe_font_driver.type = Quniscribe;
uniscribe_available = 1;
register_font_driver (&uniscribe_font_driver, NULL);
......
......@@ -129,7 +129,7 @@ static int xfont_check (struct frame *, struct font *);
struct font_driver xfont_driver =
{
LISP_INITIALLY_ZERO, /* Qx */
LISPSYM_INITIALLY (Qx),
false, /* case insensitive */
xfont_get_cache,
xfont_list,
......@@ -1120,6 +1120,5 @@ syms_of_xfont (void)
xfont_scripts_cache = CALLN (Fmake_hash_table, QCtest, Qequal);
staticpro (&xfont_scratch_props);
xfont_scratch_props = Fmake_vector (make_number (8), Qnil);
xfont_driver.type = Qx;
register_font_driver (&xfont_driver, NULL);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment