diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-10-30 12:37:08 +0300 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-10-30 12:37:08 +0300 |
| commit | 66e773e9974e4d7dbf85dd40d227b2269da76c22 (patch) | |
| tree | 3611f41f9aad47c6d98549537eca8e4b1cb6b920 | |
| parent | de86a5c06d5f102072ae695d274a730cd4510d35 (diff) | |
| download | emacs-66e773e9974e4d7dbf85dd40d227b2269da76c22.tar.gz | |
* xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize
font on an initial frame when running as a daemon (Bug#18869).
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 89c0bb8fd8e..cb13ffa8dd8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-10-30 Dmitry Antipov <dmantipov@yandex.ru> + + * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize + font on an initial frame when running as a daemon (Bug#18869). + 2014-10-30 Eli Zaretskii <eliz@gnu.org> * fileio.c (Fexpand_file_name): Use make_unibyte_string, not diff --git a/src/xfaces.c b/src/xfaces.c index 6afa0a2953d..446107ef3b7 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -3116,9 +3116,9 @@ FRAME 0 means change the face on all frames, and change the default /* FIXME: If frame is t, and selected frame is a tty frame, the font can't be realized. An improvement would be to loop over frames - for a non-tty frame and use that. See discussion in - bug#18573. */ - if (f->terminal->type != output_termcap) + for a non-tty frame and use that. See discussion in Bug#18573. + For a daemon, frame may be an initial frame (Bug#18869). */ + if (FRAME_WINDOW_P (f)) { if (! FONT_OBJECT_P (value)) { |