diff options
| author | Karoly Lorentey | 2006-05-20 11:17:52 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-20 11:17:52 +0000 |
| commit | 361c0d6e67747533b0c5e8f0dbeeebd03a3660fa (patch) | |
| tree | 209781ebe3b1902dbe24561719029169024ca046 /src | |
| parent | aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (diff) | |
| download | emacs-361c0d6e67747533b0c5e8f0dbeeebd03a3660fa.tar.gz emacs-361c0d6e67747533b0c5e8f0dbeeebd03a3660fa.zip | |
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')
| -rw-r--r-- | src/xfaces.c | 2 |
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) | |||
| 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. */ |