Mercurial > emacs
diff src/font.c @ 95894:76261fd18708
* w32fns.c (Fw32_select_font): Removed old font API function.
* w32font.c (logfont_to_fcname): New function.
(Fx_select_font): New font dialog function compatible with
GTK/fontconfig version.
* font.c (font_style_symbolic_from_value): New function.
(font_style_symbolic): Use it.
* font.h (font_style_symbolic_from_value): Declare new function.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Fri, 13 Jun 2008 14:29:47 +0000 |
parents | e6e6c351339d |
children | fbdde312e09d |
line wrap: on
line diff
--- a/src/font.c Fri Jun 13 14:28:13 2008 +0000 +++ b/src/font.c Fri Jun 13 14:29:47 2008 +0000 @@ -355,12 +355,11 @@ } Lisp_Object -font_style_symbolic (font, prop, for_face) - Lisp_Object font; +font_style_symbolic_from_value (prop, val, for_face) enum font_property_index prop; + Lisp_Object val; int for_face; { - Lisp_Object val = AREF (font, prop); Lisp_Object table, elt; int i; @@ -371,7 +370,17 @@ font_assert (((i >> 4) & 0xF) < ASIZE (table)); elt = AREF (table, ((i >> 4) & 0xF)); font_assert ((i & 0xF) + 1 < ASIZE (elt)); - return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); + return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); +} + +Lisp_Object +font_style_symbolic (font, prop, for_face) + Lisp_Object font; + enum font_property_index prop; + int for_face; +{ + Lisp_Object val = AREF (font, prop); + return font_style_symbolic_from_value (prop, val, for_face); } extern Lisp_Object Vface_alternative_font_family_alist;