(struct MFontDriver): Delete arg C of encode_char.

(mfont__encodable_p): Delete extern.

diff --git a/src/font.h b/src/font.h
index 1782b3a..06b54b8 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -170,10 +170,10 @@ struct MFontDriver
   void (*find_metric) (MRealizedFont *rfont, MGlyphString *gstring,
                       int from, int to);
 
-  /** Encode C into the glyph code the font.  CODE is a code point of
-      C in rfont->encoder->encoding_charset.  If the font has no glyph
-      for C, return MCHAR_INVALID_CODE.  */
-  unsigned (*encode_char) (MRealizedFont *rfont, int c, unsigned code);
+  /** Encode CODE into a glyph code the font.  CODE is a code point of
+      a character in rfont->encoder->encoding_charset.  If the font
+      has no glyph for CODE, return MCHAR_INVALID_CODE.  */
+  unsigned (*encode_char) (MRealizedFont *rfont, unsigned code);
 
   /** Draw glyphs from FROM to TO (exclusive) on window WIN of FRAME
       at coordinate (X, Y) relative to WIN.  */
@@ -246,9 +246,6 @@ extern MSymbol mfont__set_spec_from_plist (MFont *spec, MPlist *plist);
 
 extern void mfont__resize (MFont *spec, MFont *request);
 
-extern int mfont__encodable_p (MRealizedFont *rfont, MSymbol layouter_name,
-                              int c);
-
 extern unsigned mfont__encode_char (MRealizedFont *rfont, int c);
 
 extern MRealizedFont *mfont__select (MFrame *frame, MFont *spec,