Mercurial > emacs
changeset 90502:9d1084bd033e
(QCscalable): Extern it.
(font_parse_xlfd, font_parse_fcname): Prototype adjusted.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 28 Jun 2006 05:42:30 +0000 |
| parents | 2ef165ebcc7d |
| children | 8e3ffc0a529f |
| files | src/font.h |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/font.h Wed Jun 28 05:41:21 2006 +0000 +++ b/src/font.h Wed Jun 28 05:42:30 2006 +0000 @@ -128,7 +128,7 @@ FONT_ENTITY_MAX }; -extern Lisp_Object QCspacing, QCdpi, QCotf, QClanguage, QCscript; +extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClanguage, QCscript; /* Important character set symbols. */ extern Lisp_Object Qiso8859_1, Qiso10646_1, Qunicode_bmp; @@ -458,10 +458,10 @@ Lisp_Object, Lisp_Object)); -extern int font_parse_xlfd P_ ((char *name, Lisp_Object font, int merge)); +extern int font_parse_xlfd P_ ((char *name, Lisp_Object font)); extern int font_unparse_xlfd P_ ((Lisp_Object font, int pixel_size, char *name, int bytes)); -extern int font_parse_fcname P_ ((char *name, Lisp_Object font, int merge)); +extern int font_parse_fcname P_ ((char *name, Lisp_Object font)); extern int font_unparse_fcname P_ ((Lisp_Object font, int pixel_size, char *name, int bytes)); extern void register_font_driver P_ ((struct font_driver *driver, FRAME_PTR f));