* 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.

1 files changed, 13 insertions, 4 deletions

diff --git a/src/font.c b/src/font.c
index 2c60d0349ca..ead3a6a59a8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -355,12 +355,11 @@ font_style_to_value (prop, val, noerror)
 }
 
 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_style_symbolic (font, prop, for_face)
   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;