[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117529: * xfaces.c (Finternal_set_lisp_face_attr
From: |
Jan D. |
Subject: |
[Emacs-diffs] emacs-24 r117529: * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to |
Date: |
Wed, 01 Oct 2014 17:41:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117529
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18573
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-10-01 19:41:18 +0200
message:
* xfaces.c (Finternal_set_lisp_face_attribute): Don't try to
make a font_object from a tty frame.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xfaces.c xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-09-30 13:53:24 +0000
+++ b/src/ChangeLog 2014-10-01 17:41:18 +0000
@@ -1,3 +1,8 @@
+2014-10-01 Jan Djärv <address@hidden>
+
+ * 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 <address@hidden>
* w32fns.c (w32_createwindow): Accept an additional argument, an
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2014-07-01 07:30:33 +0000
+++ b/src/xfaces.c 2014-10-01 17:41:18 +0000
@@ -3119,17 +3119,20 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117529: * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to,
Jan D. <=