Mercurial > emacs
changeset 90506:5f608d7e835b
(font_close_object, font_merge_old_spec): Extern them.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 03 Jul 2006 00:47:06 +0000 |
| parents | 6e0ae7121a9c |
| children | 4a6034a7c870 |
| files | src/font.h |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/font.h Wed Jun 28 05:58:35 2006 +0000 +++ b/src/font.h Mon Jul 03 00:47:06 2006 +0000 @@ -156,14 +156,14 @@ a file. */ char *file_name; - /* Charset to encode a character code into a glyph code of the - font. */ + /* Charset to encode a character code into a glyph code of the font. + -1 means that the font doesn't require this information to encode + a character. */ int encoding_charset; /* Charset to check if a character code is supported by the font. -1 means that the contents of the font must be looked up to - determine it. - */ + determine it. */ int repertory_charset; /* Minimum glyph width (in pixels). */ @@ -450,12 +450,13 @@ extern void font_load_for_face P_ ((FRAME_PTR f, struct face *face)); extern void font_prepare_for_face P_ ((FRAME_PTR f, struct face *face)); extern Lisp_Object font_open_by_name P_ ((FRAME_PTR f, char *name)); +extern void font_close_object (FRAME_PTR f, Lisp_Object font_object); extern Lisp_Object intern_downcase P_ ((char *str, int len)); extern void font_update_sort_order P_ ((int *order)); -extern void font_parse_old_font_spec P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object)); +extern void font_merge_old_spec P_ ((Lisp_Object name, Lisp_Object family, + Lisp_Object registry, Lisp_Object spec)); extern int font_parse_xlfd P_ ((char *name, Lisp_Object font));