Commit 0c21fa44 authored by Jan Djärv's avatar Jan Djärv

* xfaces.c (check_lface_attrs, realize_default_face): Add

LFACE_DISTANT_FOREGROUND_INDEX.

Fixes: debbugs:15788
parent 3d42b968
2013-11-02 Jan Djärv <jan.h.d@swipnet.se>
* xfaces.c (check_lface_attrs, realize_default_face): Add
LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788).
2013-11-02 Paul Eggert <eggert@cs.ucla.edu>
* emacs.c (original_pwd): Remove global var by making it local.
......
......@@ -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
......
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