diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 468b31ce5d5..a4920d893ee 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -7914,7 +7914,7 @@ merge_faces (f, face_name, face_id, base_face_id) | |||
| 7914 | if (face_id < 0 || face_id >= lface_id_to_name_size) | 7914 | if (face_id < 0 || face_id >= lface_id_to_name_size) |
| 7915 | return base_face_id; | 7915 | return base_face_id; |
| 7916 | face_name = lface_id_to_name[face_id]; | 7916 | face_name = lface_id_to_name[face_id]; |
| 7917 | face_id = lookup_derived_face (f, face_name, 0, base_face_id); | 7917 | face_id = lookup_derived_face (f, face_name, base_face_id); |
| 7918 | if (face_id >= 0) | 7918 | if (face_id >= 0) |
| 7919 | return face_id; | 7919 | return face_id; |
| 7920 | return base_face_id; | 7920 | return base_face_id; |
| @@ -7941,7 +7941,7 @@ merge_faces (f, face_name, face_id, base_face_id) | |||
| 7941 | 7941 | ||
| 7942 | /* Look up a realized face with the given face attributes, | 7942 | /* Look up a realized face with the given face attributes, |
| 7943 | or realize a new one for ASCII characters. */ | 7943 | or realize a new one for ASCII characters. */ |
| 7944 | return lookup_face (f, attrs, 0, NULL); | 7944 | return lookup_face (f, attrs); |
| 7945 | } | 7945 | } |
| 7946 | 7946 | ||
| 7947 | 7947 | ||