diff options
| author | Glenn Morris | 2003-05-29 17:08:16 +0000 |
|---|---|---|
| committer | Glenn Morris | 2003-05-29 17:08:16 +0000 |
| commit | 074468698d68e98cd9b66f4f329e1526228dad05 (patch) | |
| tree | 64121d186c2a6a835da37202039b6db7f9e807d7 /src | |
| parent | cba32ade65ca2e70d6997b35a9323272e566f917 (diff) | |
| download | emacs-074468698d68e98cd9b66f4f329e1526228dad05.tar.gz emacs-074468698d68e98cd9b66f4f329e1526228dad05.zip | |
(realize_default_face): Do not abort if lface is non-existent -
reverts change from v1.275.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index a48961207e4..fb6494aa464 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -6575,7 +6575,12 @@ realize_default_face (f) | |||
| 6575 | /* If the `default' face is not yet known, create it. */ | 6575 | /* If the `default' face is not yet known, create it. */ |
| 6576 | lface = lface_from_face_name (f, Qdefault, 0); | 6576 | lface = lface_from_face_name (f, Qdefault, 0); |
| 6577 | if (NILP (lface)) | 6577 | if (NILP (lface)) |
| 6578 | abort (); | 6578 | { |
| 6579 | Lisp_Object frame; | ||
| 6580 | XSETFRAME (frame, f); | ||
| 6581 | lface = Finternal_make_lisp_face (Qdefault, frame); | ||
| 6582 | } | ||
| 6583 | |||
| 6579 | 6584 | ||
| 6580 | #ifdef HAVE_WINDOW_SYSTEM | 6585 | #ifdef HAVE_WINDOW_SYSTEM |
| 6581 | if (FRAME_WINDOW_P (f)) | 6586 | if (FRAME_WINDOW_P (f)) |