Mercurial > emacs

changeset 96532:addc38841ba7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set_font_frame_param): Don't try to set the font parameter if it is still unspecified in the lface.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 06 Jul 2008 03:51:06 +0000
parents ba8a7a0f34d3
children b8d0e14809ff
files src/xfaces.c
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Sun Jul 06 03:50:54 2008 +0000
+++ b/src/xfaces.c	Sun Jul 06 03:51:06 2008 +0000
@@ -3501,11 +3501,14 @@
      Lisp_Object frame, lface;
 {
   struct frame *f = XFRAME (frame);
-
-  if (FRAME_WINDOW_P (f))
-    {
-      Lisp_Object font = LFACE_FONT (lface);
-
+  Lisp_Object font;
+
+  if (FRAME_WINDOW_P (f)
+      /* Don't do anything if the font is `unspecified'.  This can
+	 happen during frame creation.  */
+      && (font = LFACE_FONT (lface),
+	  ! UNSPECIFIEDP (font)))
+    {
       if (FONT_SPEC_P (font))
 	{
 	  font = font_load_for_lface (f, XVECTOR (lface)->contents, font);