diff options
author | Kim F. Storm <[email protected]> | 2005-01-10 13:30:46 +0000 |
---|---|---|
committer | Kim F. Storm <[email protected]> | 2005-01-10 13:30:46 +0000 |
commit | a2858aae1cac104ee18fe557089a03c2a0003337 (patch) | |
tree | 6bcd2a3cdcda88ca14a94c7d5cf5ea9b7de350e4 /src | |
parent | 57a230b140ee7ddb0fb36730c968a75a4c0576cc (diff) |
(merge_faces): Rename from merge_into_realized_face.
Diffstat (limited to 'src')
-rw-r--r-- | src/dispextern.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index ccb6bc6d0c..53ae50f3c2 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2760,8 +2760,7 @@ int face_at_buffer_position P_ ((struct window *, int, int, int, int *, int, int)); int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int, int, int *, enum face_id, int)); -int merge_into_realized_face P_ ((struct frame *, Lisp_Object, - int, int)); +int merge_faces P_ ((struct frame *, Lisp_Object, int, int)); int compute_char_face P_ ((struct frame *, int, Lisp_Object)); void free_all_realized_faces P_ ((Lisp_Object)); extern Lisp_Object Qforeground_color, Qbackground_color; |