Commit e2e773b9 authored by Jan Djärv's avatar Jan Djärv
Browse files

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

make a font_object from a tty frame.

Fixes: debbugs:18573
parent 24e1e655
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> 2014-09-30 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (w32_createwindow): Accept an additional argument, an * w32fns.c (w32_createwindow): Accept an additional argument, an
......
...@@ -3119,17 +3119,20 @@ FRAME 0 means change the face on all frames, and change the default ...@@ -3119,17 +3119,20 @@ FRAME 0 means change the face on all frames, and change the default
f = XFRAME (selected_frame); f = XFRAME (selected_frame);
else else
f = XFRAME (frame); f = XFRAME (frame);
if (! FONT_OBJECT_P (value)) if (f->terminal->type != output_termcap)
{ {
Lisp_Object *attrs = XVECTOR (lface)->contents; if (! FONT_OBJECT_P (value))
Lisp_Object font_object; {
Lisp_Object *attrs = XVECTOR (lface)->contents;
font_object = font_load_for_lface (f, attrs, value); Lisp_Object font_object;
if (NILP (font_object))
signal_error ("Font not available", value); font_object = font_load_for_lface (f, attrs, value);
value = font_object; if (NILP (font_object))
} signal_error ("Font not available", value);
set_lface_from_font (f, lface, value, 1); value = font_object;
}
set_lface_from_font (f, lface, value, 1);
}
} }
else else
ASET (lface, LFACE_FONT_INDEX, value); ASET (lface, LFACE_FONT_INDEX, value);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment