Mercurial > emacs
changeset 90079:609c840fe65f
(merge_faces): Fix argument to lookup_derived_face and
lookup_face.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 17 Jan 2005 12:10:12 +0000 |
| parents | 2874904abbd4 |
| children | d25630d179cc |
| files | src/xfaces.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Mon Jan 17 12:09:23 2005 +0000 +++ b/src/xfaces.c Mon Jan 17 12:10:12 2005 +0000 @@ -7914,7 +7914,7 @@ 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); + face_id = lookup_derived_face (f, face_name, base_face_id); if (face_id >= 0) return face_id; return base_face_id; @@ -7941,7 +7941,7 @@ /* Look up a realized face with the given face attributes, or realize a new one for ASCII characters. */ - return lookup_face (f, attrs, 0, NULL); + return lookup_face (f, attrs); }