(face_for_overlay_string): Function renamed from

face_at_buffer_position_no_overlays, and add arg OVERLAY.

diff --git a/src/xfaces.c b/src/xfaces.c
index ef8842ac80424a6eff5d18fdbe55044505edc249..e405988704d0cb98b35ba3786619e2380e1b78ea 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7706,19 +7706,22 @@ face_at_buffer_position (w, pos, region_beg, region_end,
   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];