[Emacs-diffs] Changes to emacs/src/xdisp.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/03 03:47:43

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1149.2.14
retrieving revision 1.1149.2.15
diff -u -b -r1.1149.2.14 -r1.1149.2.15
--- xdisp.c     3 Nov 2007 01:50:16 -0000       1.1149.2.14
+++ xdisp.c     3 Nov 2007 03:47:42 -0000       1.1149.2.15
@@ -3367,16 +3367,31 @@
       int base_face_id, bufpos;
 
       if (it->current.overlay_string_index >= 0)
+       {
        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;
 
-      /* 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.  */
+         /* 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,