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.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/font.c b/src/font.c
index 60c0b4fdcf6..4d2f486181f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -357,11 +357,12 @@ font_style_to_value (prop, val, noerror)
 }
 
 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 @@ font_style_symbolic_from_value (prop, val, for_face)
   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));