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

(merge_faces): Rename from merge_into_realized_face.

Browse source 
Callers changed.
Add support to merge with lisp face id too (if face_name is t).
This commit is contained in:
Kim F. Storm 2005-01-10 13:35:11 +00:00
parent 539f121767
commit dc91a0ed80
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/xfaces.c
View file

@ -7691,16 +7691,19 @@ face_at_string_position (w, string, pos, bufpos, region_beg,
F is frame where faces are (to be) realized.
FACE_NAME is named face to merge, or if nil,
FACE_ID is face_id of realized face to merge.
FACE_NAME is named face to merge.
If FACE_NAME is nil, FACE_ID is face_id of realized face to merge.
If FACE_NAME is t, FACE_ID is lface_id of face to merge.
BASE_FACE_ID is realized face to merge into.
Return new face.
Return new face id.
*/
int
merge_into_realized_face (f, face_name, face_id, base_face_id)
merge_faces (f, face_name, face_id, base_face_id)
struct frame *f;
Lisp_Object face_name;
int face_id, base_face_id;
@ -7712,6 +7715,17 @@ merge_into_realized_face (f, face_name, face_id, base_face_id)
if (!base_face)
return base_face_id;
if (EQ (face_name, Qt))
{
if (face_id < 0 || face_id >= lface_id_to_name_size)
return base_face_id;
face_name = lface_id_to_name[face_id];
face_id = lookup_derived_face (f, face_name, 0, base_face_id);
if (face_id >= 0)
return face_id;
return base_face_id;
}
/* Begin with attributes from the base face. */
bcopy (base_face->lface, attrs, sizeof attrs);
@ -7723,6 +7737,8 @@ merge_into_realized_face (f, face_name, face_id, base_face_id)
else
{
struct face *face;
if (face_id < 0)
return base_face_id;
face = FACE_FROM_ID (f, face_id);
if (!face)
return base_face_id;