From 0c21fa44f01af50b27618f44c5dc8a4051d6f98b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 2 Nov 2013 08:58:54 +0100 Subject: [PATCH] * xfaces.c (check_lface_attrs, realize_default_face): Add LFACE_DISTANT_FOREGROUND_INDEX. Fixes: debbugs:15788 --- src/ChangeLog | 5 +++++ src/xfaces.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 2191cb5064e..8209f47f6f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-11-02 Jan Djärv + + * xfaces.c (check_lface_attrs, realize_default_face): Add + LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788). + 2013-11-02 Paul Eggert * emacs.c (original_pwd): Remove global var by making it local. diff --git a/src/xfaces.c b/src/xfaces.c index 72b62216abd..717690a42e5 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1805,6 +1805,9 @@ check_lface_attrs (Lisp_Object attrs[LFACE_VECTOR_SIZE]) eassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); + eassert (UNSPECIFIEDP (attrs[LFACE_DISTANT_FOREGROUND_INDEX]) + || IGNORE_DEFFACE_P (attrs[LFACE_DISTANT_FOREGROUND_INDEX]) + || STRINGP (attrs[LFACE_DISTANT_FOREGROUND_INDEX])); eassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); @@ -5352,6 +5355,9 @@ realize_default_face (struct frame *f) emacs_abort (); } + if (UNSPECIFIEDP (LFACE_DISTANT_FOREGROUND (lface))) + ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, Qnil); + if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) { /* This function is called so early that colors are not yet -- 2.39.2