Merge from mainline.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/fontset.c b/src/fontset.c
index eea65535c78..a40a3dd5f9c 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -238,7 +238,7 @@ fontset_id_valid_p (int id)
 /* Macros to access special values of (realized) FONTSET.  */
 #define FONTSET_BASE(fontset)           XCHAR_TABLE (fontset)->extras[2]
 #define FONTSET_FRAME(fontset)          XCHAR_TABLE (fontset)->extras[3]
-#define FONTSET_OBJLIST(fontset)        XCHAR_TABLE (fontset)->extras[4]
+/* #define FONTSET_OBJLIST(fontset)     XCHAR_TABLE (fontset)->extras[4] */
 #define FONTSET_NOFONT_FACE(fontset)    XCHAR_TABLE (fontset)->extras[5]
 /* #define FONTSET_REPERTORY(fontset)   XCHAR_TABLE (fontset)->extras[6] */
 #define FONTSET_DEFAULT(fontset)        XCHAR_TABLE (fontset)->extras[7]
@@ -838,6 +838,7 @@ fontset_ascii (int id)
 static void
 free_realized_fontset (FRAME_PTR f, Lisp_Object fontset)
 {
+#if 0
   Lisp_Object tail;
 
   if (0)
@@ -846,6 +847,7 @@ free_realized_fontset (FRAME_PTR f, Lisp_Object fontset)
         xassert (FONT_OBJECT_P (XCAR (tail)));
         font_close_object (f, XCAR (tail));
       }
+#endif
 }
 
 /* Free fontset of FACE defined on frame F.  Called from
@@ -881,6 +883,7 @@ free_face_fontset (FRAME_PTR f, struct face *face)
 }
 
 
+#if 0
 /* Return 1 if FACE is suitable for displaying character C.
    Otherwise return 0.  Called from the macro FACE_SUITABLE_FOR_CHAR_P
    when C is not an ASCII character.  */
@@ -896,6 +899,7 @@ face_suitable_for_char_p (struct face *face, int c)
           && INTEGERP (RFONT_DEF_FACE (rfont_def))
           && face->id == XINT (RFONT_DEF_FACE (rfont_def)));
 }
+#endif
 
 
 /* Return ID of face suitable for displaying character C on frame F.
@@ -1709,7 +1713,7 @@ int
 fontset_from_font (Lisp_Object font_object)
 {
   Lisp_Object font_name = font_get_name (font_object);
-  Lisp_Object font_spec = Fcopy_font_spec (font_object);
+  Lisp_Object font_spec = copy_font_spec (font_object);
   Lisp_Object registry = AREF (font_spec, FONT_REGISTRY_INDEX);
   Lisp_Object fontset_spec, alias, name, fontset;
   Lisp_Object val;
@@ -1726,7 +1730,7 @@ fontset_from_font (Lisp_Object font_object)
       sprintf (temp, "fontset-auto%d", num_auto_fontsets - 1);
       alias = intern (temp);
     }
-  fontset_spec = Fcopy_font_spec (font_spec);
+  fontset_spec = copy_font_spec (font_spec);
   ASET (fontset_spec, FONT_REGISTRY_INDEX, alias);
   name = Ffont_xlfd_name (fontset_spec, Qnil);
   if (NILP (name))