summaryrefslogtreecommitdiff
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2006-05-20 11:17:52 +0000
committerKaroly Lorentey <lorentey@elte.hu>2006-05-20 11:17:52 +0000
commit361c0d6e67747533b0c5e8f0dbeeebd03a3660fa (patch)
tree209781ebe3b1902dbe24561719029169024ca046 /src/xfaces.c
parentaabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (diff)
downloademacs-361c0d6e67747533b0c5e8f0dbeeebd03a3660fa.tar.gz
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
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c2
1 files changed, 1 insertions, 1 deletions
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. */