[Emacs-diffs] trunk r115038: * lisp/faces.el (describe-face): Add distant-foreground.

[Jan D.]

------------------------------------------------------------
revno: 115038
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15815
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-08 18:26:03 +0100
message:
  * lisp/faces.el (describe-face): Add distant-foreground.
  
  * src/xfaces.c (lface_fully_specified_p): Let distant-foreground be
  unspecified.
  (realize_default_face): Remove assignment to distant-foreground if
  unspecified.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/faces.el                  faces.el-20091113204419-o5vbwnq5f7feedwu-562
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-08 16:01:55 +0000
+++ b/lisp/ChangeLog    2013-11-08 17:26:03 +0000
@@ -1,3 +1,7 @@
+2013-11-08  Jan Djärv  <address@hidden>
+
+       * faces.el (describe-face): Add distant-foreground.
+
 2013-11-08  Bozhidar Batsov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-mode-set-encoding): Use

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2013-11-01 15:47:10 +0000
+++ b/lisp/faces.el     2013-11-08 17:26:03 +0000
@@ -1350,6 +1350,7 @@
                  (:weight . "Weight")
                  (:slant . "Slant")
                  (:foreground . "Foreground")
+                 (:distant-foreground . "DistantForeground")
                  (:background . "Background")
                  (:underline . "Underline")
                  (:overline . "Overline")

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-08 16:24:40 +0000
+++ b/src/ChangeLog     2013-11-08 17:26:03 +0000
@@ -1,3 +1,10 @@
+2013-11-08  Jan Djärv  <address@hidden>
+
+       * xfaces.c (lface_fully_specified_p): Let distant-foreground be
+       unspecified.
+       (realize_default_face): Remove assignment to distant-foreground if
+       unspecified (Bug#15815).
+
 2013-11-08  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (message_dolog): Make sure the *Messages* buffer has its

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-11-06 04:11:04 +0000
+++ b/src/xfaces.c      2013-11-08 17:26:03 +0000
@@ -2073,7 +2073,8 @@
   int i;
 
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
-    if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX)
+    if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX
+        && i != LFACE_DISTANT_FOREGROUND_INDEX)
       if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i])))
        break;
 
@@ -5343,9 +5344,6 @@
        emacs_abort ();
     }
 
-  if (UNSPECIFIEDP (LFACE_DISTANT_FOREGROUND (lface)))
-    ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, build_string 
(unspecified_fg));
-
   if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))
     {
       /* This function is called so early that colors are not yet