mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 19:10:37 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
make a font_object from a tty frame.

Fixes: debbugs:18573
This commit is contained in:
Jan Djärv 2014-10-01 19:41:18 +02:00
parent 24e1e65553
commit e2e773b9e6
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-10-01 Jan Djärv <jan.h.d@swipnet.se>
* xfaces.c (Finternal_set_lisp_face_attribute): Don't try to
make a font_object from a tty frame (Bug#18573).
2014-09-30 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (w32_createwindow): Accept an additional argument, an

23
src/xfaces.c
View file

@ -3119,17 +3119,20 @@ FRAME 0 means change the face on all frames, and change the default
f = XFRAME (selected_frame);
else
f = XFRAME (frame);
if (! FONT_OBJECT_P (value))
{
Lisp_Object *attrs = XVECTOR (lface)->contents;
Lisp_Object font_object;
if (f->terminal->type != output_termcap)
{
if (! FONT_OBJECT_P (value))
{
Lisp_Object *attrs = XVECTOR (lface)->contents;
Lisp_Object font_object;
font_object = font_load_for_lface (f, attrs, value);
if (NILP (font_object))
signal_error ("Font not available", value);
value = font_object;
}
set_lface_from_font (f, lface, value, 1);
font_object = font_load_for_lface (f, attrs, value);
if (NILP (font_object))
signal_error ("Font not available", value);
value = font_object;
}
set_lface_from_font (f, lface, value, 1);
}
}
else
ASET (lface, LFACE_FONT_INDEX, value);