# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1223995280 0
# Node ID 507c5c477e6076cd60ba78fba5715ca4ad5ab160
# Parent  3e598e2ce8a6384d5cdd0b01f478290840077efe
(font_clear_prop): When clearing font width, clear the average width
field too.

diff -r 3e598e2ce8a6 -r 507c5c477e60 src/font.c
--- a/src/font.c	Tue Oct 14 14:41:11 2008 +0000
+++ b/src/font.c	Tue Oct 14 14:41:20 2008 +0000
@@ -2996,7 +2996,9 @@
   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 @@
       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;
 }