[Emacs-diffs] trunk r114902: * xfaces.c (check_lface_attrs, realize_default_face): Add

[Jan D.]

------------------------------------------------------------
revno: 114902
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15788
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 08:58:54 +0100
message:
  * xfaces.c (check_lface_attrs, realize_default_face): Add
  LFACE_DISTANT_FOREGROUND_INDEX.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-02 02:11:37 +0000
+++ b/src/ChangeLog     2013-11-02 07:58:54 +0000
@@ -1,3 +1,8 @@
+2013-11-02  Jan Djärv  <address@hidden>
+
+       * xfaces.c (check_lface_attrs, realize_default_face): Add
+       LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788).
+
 2013-11-02  Paul Eggert  <address@hidden>
 
        * emacs.c (original_pwd): Remove global var by making it local.

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-11-01 15:47:10 +0000
+++ b/src/xfaces.c      2013-11-02 07:58:54 +0000
@@ -1805,6 +1805,9 @@
   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 @@
        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