merge from trunk

2 files changed, 12 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e252e4a2f4f..bee477c745a 100644
--- 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 9e40cd26259..551774ae2fd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3919,10 +3919,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);
         }