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, 0 insertions, 4 deletions

diff --git a/src/font.h b/src/font.h
index cc14365508c..522343255e7 100644
--- a/src/font.h
+++ b/src/font.h
@@ -776,10 +776,6 @@ extern int font_style_to_value P_ ((enum font_property_index prop,
 extern Lisp_Object font_style_symbolic P_ ((Lisp_Object font,
                                             enum font_property_index prop,
                                             int for_face));
-extern Lisp_Object font_style_symbolic_from_value
-                      P_ ((enum font_property_index prop,
-                           Lisp_Object val,
-                           int for_face));
                            
 extern int font_match_p P_ ((Lisp_Object spec, Lisp_Object entity));
 extern Lisp_Object font_list_entities P_ ((Lisp_Object frame,