(handle_face_prop): Use face_at_buffer_position_no_overlays

to get the base face for an overlay string.

diff --git a/src/ChangeLog b/src/ChangeLog
index 42ebbddb65203e57c77629e27afa5d11334bce92..13c5b45267650610d61e456d263b5edc1015011f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2007-11-03  Richard Stallman  <rms@gnu.org>
 
+       * xdisp.c (handle_face_prop): Use face_at_buffer_position_no_overlays
+       to get the base face for an overlay string.
+
+       * dispextern.h (face_at_buffer_position_no_overlays): Add decl.
+
+       * xfaces.c (face_at_buffer_position_no_overlays): New function.
+
        * xdisp.c (handle_stop): Move some code out of loop.
 
 2007-11-01  Johan Bockg\e,Ae\e(Brd  <bojohan@gnu.org>

diff --git a/src/xdisp.c b/src/xdisp.c
index ef8c6c836aa83a2db4f57cc64f1e9d7f0001f969..4e3c0445e2e79c9c2255a160daaa065f6936e992 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3367,16 +3367,31 @@ handle_face_prop (it)
       int base_face_id, bufpos;
 
       if (it->current.overlay_string_index >= 0)
-       bufpos = IT_CHARPOS (*it);
+       {
+         bufpos = IT_CHARPOS (*it);
+         /* For an overlay face, the base face depends
+            only on text properties and ignores overlays.  */
+         base_face_id
+           = face_at_buffer_position_no_overlays (it->w,
+                                                  IT_CHARPOS (*it),
+                                                  it->region_beg_charpos,
+                                                  it->region_end_charpos,
+                                                  &next_stop,
+                                                  (IT_CHARPOS (*it)
+                                                   + TEXT_PROP_DISTANCE_LIMIT),
+                                                  0);
+       }
       else
-       bufpos = 0;
+       {
+         bufpos = 0;
 
-      /* For strings from a buffer, i.e. overlay strings or strings
-        from a `display' property, use the face at IT's current
-        buffer position as the base face to merge with, so that
-        overlay strings appear in the same face as surrounding
-        text, unless they specify their own faces.  */
-      base_face_id = underlying_face_id (it);
+         /* For strings from a `display' property, use the face at
+            IT's current buffer position as the base face to merge
+            with, so that overlay strings appear in the same face as
+            surrounding text, unless they specify their own
+            faces.  */
+         base_face_id = underlying_face_id (it);
+       }
 
       new_face_id = face_at_string_position (it->w,
                                             it->string,