From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 4 Nov 2007 07:32:41 +0000 (+0000)
Subject: (face_for_overlay_string): Function renamed from
X-Git-Tag: emacs-pretest-22.1.90~428
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a193ecf139c3a9876272385b68f31eb5f2d824d5;p=emacs.git

(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 ef8842ac804..e405988704d 100644
--- 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];