(font_clear_prop): If clearing the family, clear the font width index

too.

diff --git a/src/font.c b/src/font.c
index 3cb48e3df7c8979170ec2b3ea0db45ee1f8c67ff..b7f4c42fc62172e5e5f96d834512e0f1979c02ba 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3083,7 +3083,13 @@ font_clear_prop (attrs, prop)
   if (prop == FONT_FAMILY_INDEX || prop == FONT_FOUNDRY_INDEX)
     {
       if (prop == FONT_FAMILY_INDEX)
-       ASET (font, FONT_FOUNDRY_INDEX, Qnil);
+       {
+         ASET (font, FONT_FOUNDRY_INDEX, Qnil);
+         /* If we are setting the font family, we must also clear
+            FONT_WIDTH_INDEX to avoid rejecting families that lack
+            support for some widths.  */
+         ASET (font, FONT_WIDTH_INDEX, Qnil);
+       }
       ASET (font, FONT_ADSTYLE_INDEX, Qnil);
       ASET (font, FONT_REGISTRY_INDEX, Qnil);
       ASET (font, FONT_SIZE_INDEX, Qnil);