aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/xfaces.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2a5c828578f..59a43d9a391 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-11-08 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xfaces.c (lface_fully_specified_p): Let distant-foreground be
4 unspecified.
5 (realize_default_face): Remove assignment to distant-foreground if
6 unspecified (Bug#15815).
7
12013-11-08 Eli Zaretskii <eliz@gnu.org> 82013-11-08 Eli Zaretskii <eliz@gnu.org>
2 9
3 * xdisp.c (message_dolog): Make sure the *Messages* buffer has its 10 * 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])
2073 int i; 2073 int i;
2074 2074
2075 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) 2075 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
2076 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX) 2076 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX
2077 && i != LFACE_DISTANT_FOREGROUND_INDEX)
2077 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i]))) 2078 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i])))
2078 break; 2079 break;
2079 2080
@@ -5343,9 +5344,6 @@ realize_default_face (struct frame *f)
5343 emacs_abort (); 5344 emacs_abort ();
5344 } 5345 }
5345 5346
5346 if (UNSPECIFIEDP (LFACE_DISTANT_FOREGROUND (lface)))
5347 ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, build_string (unspecified_fg));
5348
5349 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) 5347 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))
5350 { 5348 {
5351 /* This function is called so early that colors are not yet 5349 /* This function is called so early that colors are not yet