From: Kim F. Storm Date: Mon, 10 Jan 2005 13:30:46 +0000 (+0000) Subject: (merge_faces): Rename from merge_into_realized_face. X-Git-Tag: ttn-vms-21-2-B4~2832 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2858aae1cac104ee18fe557089a03c2a0003337;p=emacs.git (merge_faces): Rename from merge_into_realized_face. --- diff --git a/src/dispextern.h b/src/dispextern.h index ccb6bc6d0c4..53ae50f3c2a 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;