diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-03-22 23:02:03 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-03-22 23:02:03 +0000 |
| commit | d196a54737897fdd4a19ca62034f53ce731d5f20 (patch) | |
| tree | 3c4e69bd1e9281fad6ad1fb8cd975f9b8912ce05 /src/xfaces.c | |
| parent | 3a2b4c84ccc212721da2a8d73ebe794194bf2b51 (diff) | |
| download | emacs-d196a54737897fdd4a19ca62034f53ce731d5f20.tar.gz | |
(lookup_derived_face): Add arg SIGNAL_P.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 753b20765d8..146036aa97e 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5775,7 +5775,7 @@ face_with_height (f, face_id, height) is assumed to be already realized. */ int -lookup_derived_face (f, symbol, c, face_id) +lookup_derived_face (f, symbol, c, face_id, signal_p) struct frame *f; Lisp_Object symbol; int c; @@ -5788,7 +5788,7 @@ lookup_derived_face (f, symbol, c, face_id) if (!default_face) abort (); - get_lface_attributes (f, symbol, symbol_attrs, 1); + get_lface_attributes (f, symbol, symbol_attrs, signal_p); bcopy (default_face->lface, attrs, sizeof attrs); merge_face_vectors (f, symbol_attrs, attrs, 0); return lookup_face (f, attrs, c, default_face); @@ -7731,7 +7731,7 @@ merge_faces (f, face_name, face_id, base_face_id) 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, 0, base_face_id, 1); if (face_id >= 0) return face_id; return base_face_id; |