* xfaces.c (Finternal_merge_in_global_face): If default face was

modified, realize it again.  Update the font face attribute.

diff --git a/src/ChangeLog b/src/ChangeLog
index 956c2656174927afc9829f253a03ef281ecfbfad..1d82db5fd7f9ca8d611d70d16bf18b79e3b765b1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-30  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xfaces.c (Finternal_merge_in_global_face): If default face was
+       modified, realize it again.  Update the font face attribute.
+
 2008-06-29  Jason Rumney  <jasonr@gnu.org>
 
         * w32term.c (x_set_frame_alpha): Fix logic.