# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1105363846 0
# Node ID 08a75ace96a6a2b9ee8888680d84b769a43bbb4a
# Parent  e024e6716c4a6ba3f108d78fa71f9867c78f19e1
(merge_faces): Rename from merge_into_realized_face.

diff -r e024e6716c4a -r 08a75ace96a6 src/dispextern.h
--- 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;