Mercurial > emacs
changeset 102483:d25713758c3e
(font_open_by_spec): New function.
(font_open_by_name): Use font_open_by_spec.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 11 Mar 2009 11:44:04 +0000 |
| parents | 1c58a919d8b9 |
| children | 3e084f3715bd |
| files | src/font.c |
| diffstat | 1 files changed, 24 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/font.c Wed Mar 11 07:58:42 2009 +0000 +++ b/src/font.c Wed Mar 11 11:44:04 2009 +0000 @@ -3484,20 +3484,16 @@ } -/* Open a font best matching with NAME on frame F. If no proper font - is found, return Qnil. */ +/* Open a font matching with font-spec SPEC on frame F. If no proper + font is found, return Qnil. */ Lisp_Object -font_open_by_name (f, name) +font_open_by_spec (f, spec) FRAME_PTR f; - char *name; + Lisp_Object spec; { - Lisp_Object args[2]; - Lisp_Object spec, attrs[LFACE_VECTOR_SIZE]; - - args[0] = QCname; - args[1] = make_unibyte_string (name, strlen (name)); - spec = Ffont_spec (2, args); + Lisp_Object attrs[LFACE_VECTOR_SIZE]; + /* We set up the default font-related attributes of a face to prefer a moderate font. */ attrs[LFACE_FAMILY_INDEX] = attrs[LFACE_FOUNDRY_INDEX] = Qnil; @@ -3514,6 +3510,24 @@ } +/* Open a font matching with NAME on frame F. If no proper font is + found, return Qnil. */ + +Lisp_Object +font_open_by_name (f, name) + FRAME_PTR f; + char *name; +{ + Lisp_Object args[2]; + Lisp_Object spec; + + args[0] = QCname; + args[1] = make_unibyte_string (name, strlen (name)); + spec = Ffont_spec (2, args); + return font_open_by_spec (f, spec); +} + + /* Register font-driver DRIVER. This function is used in two ways. The first is with frame F non-NULL. In this case, make DRIVER