Mercurial > emacs
changeset 59456:08a75ace96a6
(merge_faces): Rename from merge_into_realized_face.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 10 Jan 2005 13:30:46 +0000 |
| parents | e024e6716c4a |
| children | fae5995f1816 |
| files | src/dispextern.h |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispextern.h Mon Jan 10 13:29:50 2005 +0000 +++ b/src/dispextern.h Mon Jan 10 13:30:46 2005 +0000 @@ -2760,8 +2760,7 @@ 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;