Mercurial > emacs

changeset 83519:717426715b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 20 May 2006 11:17:52 +0000
parents ab6ab63755f7
children d2824fa4fa24
files src/xfaces.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Sat May 20 10:32:11 2006 +0000
+++ b/src/xfaces.c	Sat May 20 11:17:52 2006 +0000
@@ -7092,7 +7092,7 @@
 
 #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.  */