From: Karoly Lorentey <lorentey@elte.hu>
Date: Sat, 20 May 2006 11:17:52 +0000 (+0000)
Subject: Fix stupid crash during startup.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=361c0d6e67747533b0c5e8f0dbeeebd03a3660fa;p=emacs.git

Fix stupid crash during startup.

* src/xfaces.c (realize_default_face): Don't use FRAME_FONT unless frame
  is an X frame.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-559
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 15556ca88f8..0a77a24189f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7092,7 +7092,7 @@ realize_default_face (f)
 
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS  
-  if (face->font != FRAME_FONT (f))
+  if (FRAME_X_P (f) && face->font != FRAME_FONT (f))
     /* As the font specified for the frame was not acceptable as a
        font for the default face (perhaps because auto-scaled fonts
        are rejected), we must adjust the frame font.  */