Set adstyle within sfnt font objects

* src/sfntfont.c (sfntfont_open): Don't incorrectly clear
desc->adstyle.

(cherry picked from commit b3821357696d44e3f553af14c209a21e69187c32)

diff --git a/src/sfntfont.c b/src/sfntfont.c
index 860fc446184847ca7c122a66fe6ac7430387885a..3be770f650edcf7590fad1f43f5292e9cf70e249 100644 (file)
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -3308,7 +3308,7 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity,
   ASET (font_object, FONT_TYPE_INDEX, sfnt_vendor_name);
   ASET (font_object, FONT_FOUNDRY_INDEX, desc->designer);
   ASET (font_object, FONT_FAMILY_INDEX, Fintern (desc->family, Qnil));
-  ASET (font_object, FONT_ADSTYLE_INDEX, Qnil);
+  ASET (font_object, FONT_ADSTYLE_INDEX, desc->adstyle);
   ASET (font_object, FONT_REGISTRY_INDEX,
        sfntfont_registry_for_desc (desc));
 
@@ -3326,8 +3326,6 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity,
   FONT_SET_STYLE (font_object, FONT_SLANT_INDEX,
                  make_fixnum (desc->slant));
 
-  ASET (font_object, FONT_ADSTYLE_INDEX, Qnil);
-
   /* Clear various offsets.  */
   font_info->font.baseline_offset = 0;
   font_info->font.relative_compose = 0;
@@ -3412,7 +3410,7 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity,
                          AREF (tem, 3));
          FONT_SET_STYLE (font_object, FONT_SLANT_INDEX,
                          AREF (tem, 4));
-         ASET (font_object, FONT_ADSTYLE_INDEX, Qnil);
+         ASET (font_object, FONT_ADSTYLE_INDEX, AREF (tem, 1));
        }
     }