# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1239844104 0
# Node ID 42574e6202e2e2f430699134efea8c5f2d8eb53a
# Parent  6d2bcfa618d7aef4bccd4178991d29c7401a2734
(merge_face_vectors): Reflect font properties in
to[LFACE_FONT_INDEX] to the other face attributes.  Don't call
font_clear_prop if a face attribute doesn't change.

diff -r 6d2bcfa618d7 -r 42574e6202e2 src/xfaces.c
--- a/src/xfaces.c	Thu Apr 16 01:05:10 2009 +0000
+++ b/src/xfaces.c	Thu Apr 16 01:08:24 2009 +0000
@@ -2449,6 +2449,16 @@
 	to[i] = Fmerge_font_spec (from[i], to[i]);
       else
 	to[i] = Fcopy_font_spec (from[i]);
+      if (! NILP (AREF (to[i], FONT_FOUNDRY_INDEX)))
+	to[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FOUNDRY_INDEX));
+      if (! NILP (AREF (to[i], FONT_FAMILY_INDEX)))
+	to[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FAMILY_INDEX));
+      if (! NILP (AREF (to[i], FONT_WEIGHT_INDEX)))
+	to[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (to[i]);
+      if (! NILP (AREF (to[i], FONT_SLANT_INDEX)))
+	to[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (to[i]);
+      if (! NILP (AREF (to[i], FONT_WIDTH_INDEX)))
+	to[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (to[i]);
       ASET (to[i], FONT_SIZE_INDEX, Qnil);
     }
 
@@ -2460,7 +2470,8 @@
 	    to[i] = merge_face_heights (from[i], to[i], to[i]);
 	    font_clear_prop (to, FONT_SIZE_INDEX);
 	  }
-	else if (i != LFACE_FONT_INDEX)
+	else if (i != LFACE_FONT_INDEX
+		 && ! EQ (to[i], from[i]))
 	  {
 	    to[i] = from[i];
 	    if (i >= LFACE_FAMILY_INDEX && i <=LFACE_SLANT_INDEX)