4 files changed, 14 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e76cc6c846..0781971c38f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * faces.el (describe-face): Add distant-foreground.
+
 2013-11-08  Bozhidar Batsov  <bozhidar@batsov.com>
 
         * progmodes/ruby-mode.el (ruby-mode-set-encoding): Use
diff --git a/lisp/faces.el b/lisp/faces.el
index 8ff93874de0..0e965a89ba7 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1350,6 +1350,7 @@ If FRAME is omitted or nil, use the selected frame."
                   (:weight . "Weight")
                   (:slant . "Slant")
                   (:foreground . "Foreground")
+                  (:distant-foreground . "DistantForeground")
                   (:background . "Background")
                   (:underline . "Underline")
                   (:overline . "Overline")
diff --git a/src/ChangeLog b/src/ChangeLog
index 2a5c828578f..59a43d9a391 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * 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  <eliz@gnu.org>
 
         * xdisp.c (message_dolog): Make sure the *Messages* buffer has its
diff --git a/src/xfaces.c b/src/xfaces.c
index de7636e960b..b9ddddfd9e2 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2073,7 +2073,8 @@ lface_fully_specified_p (Lisp_Object attrs[LFACE_VECTOR_SIZE])
   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 @@ realize_default_face (struct frame *f)
         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