[Emacs-diffs] trunk r113979: Fix bug #15155 with ignoring face remapping for strings from prefix properties.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113979
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15155
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-23 17:25:39 +0300
message:
  Fix bug #15155 with ignoring face remapping for strings from prefix 
properties.
  
   src/xdisp.c (handle_face_prop): If the default face was remapped use
   the remapped face for strings from prefix properties.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-23 04:03:25 +0000
+++ b/src/ChangeLog     2013-08-23 14:25:39 +0000
@@ -1,3 +1,8 @@
+2013-08-23  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (handle_face_prop): If the default face was remapped use
+       the remapped face for strings from prefix properties.  (Bug#15155)
+
 2013-08-23  Dmitry Antipov  <address@hidden>
 
        Minor cleanup for redisplay interface and few related functions.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-23 04:03:25 +0000
+++ b/src/xdisp.c       2013-08-23 14:25:39 +0000
@@ -3912,10 +3912,14 @@
          /* 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.  */
+            surrounding text, unless they specify their own faces.
+            For strings from wrap-prefix and line-prefix properties,
+            use the default face, possibly remapped via
+            Vface_remapping_alist.  */
          base_face_id = it->string_from_prefix_prop_p
-           ? DEFAULT_FACE_ID
+           ? (!NILP (Vface_remapping_alist)
+              ? lookup_basic_face (it->f, DEFAULT_FACE_ID)
+              : DEFAULT_FACE_ID)
            : underlying_face_id (it);
        }