From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 6 Jul 2008 03:51:06 +0000 (+0000)
Subject: (set_font_frame_param): Don't try to set the font parameter if it is
X-Git-Tag: emacs-pretest-23.0.90~4306
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be22aa971355e15a78d46c60ce285afd474da313;p=emacs.git

(set_font_frame_param): Don't try to set the font parameter if it is
still unspecified in the lface.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 382e1327679..ed802b03f7c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3501,11 +3501,14 @@ set_font_frame_param (frame, lface)
      Lisp_Object frame, lface;
 {
   struct frame *f = XFRAME (frame);
+  Lisp_Object font;
 
-  if (FRAME_WINDOW_P (f))
+  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)))
     {
-      Lisp_Object font = LFACE_FONT (lface);
-
       if (FONT_SPEC_P (font))
 	{
 	  font = font_load_for_lface (f, XVECTOR (lface)->contents, font);