From 04355cb50485f109aabb8e9a815412fbb0d1e750 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 1 Dec 2016 00:32:54 -0800
Subject: [PATCH] * src/lisp.h (LISP_INITIALLY_ZERO): Remove.

All uses replaced by LISPSYM_INITIALLY.
---
 src/ftfont.c       | 3 +--
 src/lisp.h         | 2 --
 src/macfont.m      | 3 +--
 src/nsfont.m       | 3 +--
 src/w32font.c      | 3 +--
 src/w32uniscribe.c | 3 +--
 src/xfont.c        | 3 +--
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/ftfont.c b/src/ftfont.c
index 1ae3f88daa3..17fe66828fa 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -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);
 }
diff --git a/src/lisp.h b/src/lisp.h
index 6fbedd3b1f5..b6c46687b28 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -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.  */
 
diff --git a/src/macfont.m b/src/macfont.m
index 3af9edc148a..b3a2fb84205 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -1665,7 +1665,7 @@ static void macfont_filter_properties (Lisp_Object, Lisp_Object);
 
 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 @@ syms_of_macfont (void)
 {
   /* 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
diff --git a/src/nsfont.m b/src/nsfont.m
index 389d0ed7aa4..c4c3c8dce7e 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -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 @@ ns_dump_glyphstring (struct glyph_string *s)
 void
 syms_of_nsfont (void)
 {
-  nsfont_driver.type = Qns;
   register_font_driver (&nsfont_driver, NULL);
   DEFSYM (Qcondensed, "condensed");
   DEFSYM (Qexpanded, "expanded");
diff --git a/src/w32font.c b/src/w32font.c
index 4d15cffb9f6..e966024517f 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -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);
 }
 
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 5f91b5022dd..960ee068e87 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -1135,7 +1135,7 @@ font_table_error:
 
 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);
diff --git a/src/xfont.c b/src/xfont.c
index c2b73173968..ccb8f070626 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -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);
 }
-- 
2.39.5