mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-03 04:21:28 -08:00
Code Issues Projects Releases Wiki Activity

* xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize

Browse source 
font on an initial frame when running as a daemon (Bug#18869).
This commit is contained in:
Dmitry Antipov 2014-10-30 12:37:08 +03:00
parent de86a5c06d
commit 66e773e997
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

6
src/xfaces.c
View file

@ -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))
{