(font_clear_prop): When clearing font width, clear the average width

field too.
This commit is contained in:
Chong Yidong 2008-10-14 14:41:20 +00:00
parent 050a81e9b2
commit e234927a7e

View file

@ -2996,7 +2996,9 @@ font_clear_prop (attrs, prop)
if (! FONTP (font))
return;
if (NILP (AREF (font, prop))
&& prop != FONT_FAMILY_INDEX && prop != FONT_FOUNDRY_INDEX
&& prop != FONT_FAMILY_INDEX
&& prop != FONT_FOUNDRY_INDEX
&& prop != FONT_WIDTH_INDEX
&& prop != FONT_SIZE_INDEX)
return;
font = Fcopy_font_spec (font);
@ -3018,6 +3020,8 @@ font_clear_prop (attrs, prop)
ASET (font, FONT_SPACING_INDEX, Qnil);
ASET (font, FONT_AVGWIDTH_INDEX, Qnil);
}
else if (prop == FONT_WIDTH_INDEX)
ASET (font, FONT_AVGWIDTH_INDEX, Qnil);
attrs[LFACE_FONT_INDEX] = font;
}