procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/faces.el (describe-face): Add distant-foreground.

Browse source 
* src/xfaces.c (lface_fully_specified_p): Let distant-foreground be
unspecified.
(realize_default_face): Remove assignment to distant-foreground if
unspecified.

Fixes: debbugs:15815
This commit is contained in:
Jan Djärv 2013-11-08 18:26:03 +01:00
parent 220a304ac3
commit 5b97b4c0df
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

1
lisp/faces.el
View file

@ -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")

7
src/ChangeLog
View file

@ -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

6
src/xfaces.c
View file

@ -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