* xfaces.c (set_font_frame_param): Don't try to set the font

parameter if it is still unspecified in the lface.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ab19d764956f67e1ccc5a4233ba149bde174b52..dbda1cf96e278ad1ee3bf7681937081b62ad4f25 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xfaces.c (set_font_frame_param): Don't try to set the font
+       parameter if it is still unspecified in the lface.
+
 2008-07-05  Chong Yidong  <cyd@stupidchicken.com>
 
        * xfaces.c (Finternal_merge_in_global_face): Don't realize default