mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-21 12:03:55 -08:00
Code Issues Projects Releases Wiki Activity

(Finternal_merge_in_global_face): Save merged attributes for the

Browse source 
default face back into the face vector.
This commit is contained in:
Chong Yidong 2008-07-08 17:27:28 +00:00
parent 7f000038fe
commit fa9fa316d4
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/xfaces.c
View file

@ -3966,7 +3966,7 @@ Default face attributes override any local face attributes. */)
else if (! UNSPECIFIEDP (gvec[i]))
lvec[i] = gvec[i];
/* If the default face was changed, realize it again, and update the
/* If the default face was changed, update the face cache and the
`font' frame parameter. */
if (EQ (face, Qdefault))
{
@ -3977,9 +3977,12 @@ Default face attributes override any local face attributes. */)
/* This can be NULL (e.g., in batch mode). */
if (oldface)
{
/* Ensure that the face vector is fully specified by merging
the previously-cached vector. */
bcopy (oldface->lface, attrs, sizeof attrs);
merge_face_vectors (f, lvec, attrs, 0);
newface = realize_face (c, attrs, DEFAULT_FACE_ID);
bcopy (attrs, lvec, sizeof attrs);
newface = realize_face (c, lvec, DEFAULT_FACE_ID);
if ((! UNSPECIFIEDP (gvec[LFACE_FAMILY_INDEX])
|| ! UNSPECIFIEDP (gvec[LFACE_FOUNDRY_INDEX])