comparison src/font.c @ 101156:fe4728c4a48b

(font_clear_prop): If clearing the family, clear the font width index too.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 13 Jan 2009 20:02:59 +0000
parents d3a67a9e7177
children 63d9f73bf9d9
comparison
equal deleted inserted replaced
101155:9e5f8e946d21 101156:fe4728c4a48b
3081 font = Fcopy_font_spec (font); 3081 font = Fcopy_font_spec (font);
3082 ASET (font, prop, Qnil); 3082 ASET (font, prop, Qnil);
3083 if (prop == FONT_FAMILY_INDEX || prop == FONT_FOUNDRY_INDEX) 3083 if (prop == FONT_FAMILY_INDEX || prop == FONT_FOUNDRY_INDEX)
3084 { 3084 {
3085 if (prop == FONT_FAMILY_INDEX) 3085 if (prop == FONT_FAMILY_INDEX)
3086 ASET (font, FONT_FOUNDRY_INDEX, Qnil); 3086 {
3087 ASET (font, FONT_FOUNDRY_INDEX, Qnil);
3088 /* If we are setting the font family, we must also clear
3089 FONT_WIDTH_INDEX to avoid rejecting families that lack
3090 support for some widths. */
3091 ASET (font, FONT_WIDTH_INDEX, Qnil);
3092 }
3087 ASET (font, FONT_ADSTYLE_INDEX, Qnil); 3093 ASET (font, FONT_ADSTYLE_INDEX, Qnil);
3088 ASET (font, FONT_REGISTRY_INDEX, Qnil); 3094 ASET (font, FONT_REGISTRY_INDEX, Qnil);
3089 ASET (font, FONT_SIZE_INDEX, Qnil); 3095 ASET (font, FONT_SIZE_INDEX, Qnil);
3090 ASET (font, FONT_DPI_INDEX, Qnil); 3096 ASET (font, FONT_DPI_INDEX, Qnil);
3091 ASET (font, FONT_SPACING_INDEX, Qnil); 3097 ASET (font, FONT_SPACING_INDEX, Qnil);