Mercurial > emacs
diff src/font.c @ 96005:66f0213be62a
Fix crashing bug in use of bold fonts from x-select-font on W32.
* w32font.c (w32_to_fc_weight): New function.
(w32font_full_name, logfont_to_fcname): Use it.
* font.h (font_style_symbolic_from_value): Remove.
* font.c (font_style_symbolic_from_value): Remove.
(font_style_symbolic): Revert to pre 2008-06-13 version.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Mon, 16 Jun 2008 09:11:05 +0000 |
parents | f2d08191aec7 |
children | c0401e586ca3 |
line wrap: on
line diff
--- a/src/font.c Mon Jun 16 08:55:56 2008 +0000 +++ b/src/font.c Mon Jun 16 09:11:05 2008 +0000 @@ -357,11 +357,12 @@ } Lisp_Object -font_style_symbolic_from_value (prop, val, for_face) +font_style_symbolic (font, prop, for_face) + Lisp_Object font; enum font_property_index prop; - Lisp_Object val; int for_face; { + Lisp_Object val = AREF (font, prop); Lisp_Object table, elt; int i; @@ -375,16 +376,6 @@ 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; extern Lisp_Object find_font_encoding P_ ((Lisp_Object));