# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1194161561 0
# Node ID 6c386e3cec2a19b2d219e69ce82dfac2b854fd69
# Parent  e92ea7511121c3a01644a9a161c6a1e7cc34d631
(face_for_overlay_string): Function renamed from
face_at_buffer_position_no_overlays, and add arg OVERLAY.

diff -r e92ea7511121 -r 6c386e3cec2a src/xfaces.c
--- a/src/xfaces.c	Sun Nov 04 07:31:56 2007 +0000
+++ b/src/xfaces.c	Sun Nov 04 07:32:41 2007 +0000
@@ -7706,19 +7706,22 @@
   return lookup_face (f, attrs, 0, NULL);
 }
 
-/* Return the face ID associated with buffer position POS for
-   displaying ASCII characters, but without overlays.
-   Like face_at_buffer_position except it ignores overlays.  */
+/* Return the face ID at buffer position POS for displaying ASCII
+   characters associated with overlay strings for overlay OVERLAY.
+
+   Like face_at_buffer_position except for OVERLAY.  Currently it
+   simply disregards the `face' properties of all overlays.  */
 
 int
-face_at_buffer_position_no_overlays (w, pos, region_beg, region_end,
-				     endptr, limit, mouse)
+face_for_overlay_string (w, pos, region_beg, region_end,
+			 endptr, limit, mouse, overlay)
      struct window *w;
      int pos;
      int region_beg, region_end;
      int *endptr;
      int limit;
      int mouse;
+     Lisp_Object overlay;
 {
   struct frame *f = XFRAME (w->frame);
   Lisp_Object attrs[LFACE_VECTOR_SIZE];