Mercurial > emacs
comparison src/xfaces.c @ 83519:717426715b03
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 | c44562301a11 |
comparison
equal
deleted
inserted
replaced
| 83518:ab6ab63755f7 | 83519:717426715b03 |
|---|---|
| 7090 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | 7090 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); |
| 7091 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); | 7091 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); |
| 7092 | 7092 |
| 7093 #ifdef HAVE_WINDOW_SYSTEM | 7093 #ifdef HAVE_WINDOW_SYSTEM |
| 7094 #ifdef HAVE_X_WINDOWS | 7094 #ifdef HAVE_X_WINDOWS |
| 7095 if (face->font != FRAME_FONT (f)) | 7095 if (FRAME_X_P (f) && face->font != FRAME_FONT (f)) |
| 7096 /* As the font specified for the frame was not acceptable as a | 7096 /* As the font specified for the frame was not acceptable as a |
| 7097 font for the default face (perhaps because auto-scaled fonts | 7097 font for the default face (perhaps because auto-scaled fonts |
| 7098 are rejected), we must adjust the frame font. */ | 7098 are rejected), we must adjust the frame font. */ |
| 7099 x_set_font (f, build_string (face->font_name), Qnil); | 7099 x_set_font (f, build_string (face->font_name), Qnil); |
| 7100 #endif /* HAVE_X_WINDOWS */ | 7100 #endif /* HAVE_X_WINDOWS */ |