[Emacs-diffs] Changes to emacs/src/xfaces.c,v [EMACS_22_BASE]

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/11/04 07:32:41

Index: xfaces.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfaces.c,v
retrieving revision 1.359.2.5
retrieving revision 1.359.2.6
diff -u -b -r1.359.2.5 -r1.359.2.6
--- xfaces.c    3 Nov 2007 03:46:22 -0000       1.359.2.5
+++ xfaces.c    4 Nov 2007 07:32:41 -0000       1.359.2.6
@@ -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];