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.

diff --git a/src/ChangeLog b/src/ChangeLog
index e252e4a2f4f4f4e371d90766404a477908c97d30..bee477c745a45d596c51bdb19dab557638b5126e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <dmantipov@yandex.ru>
 
        Minor cleanup for redisplay interface and few related functions.

diff --git a/src/xdisp.c b/src/xdisp.c
index 53fc6d8564771d5fceb9ce5c951de47313d63b63..ca130473c0f3f489d967077feededfa1cd58b822 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3912,10 +3912,14 @@ handle_face_prop (struct it *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.  */
+            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);
        }