From: Eli Zaretskii Date: Fri, 23 Aug 2013 14:25:39 +0000 (+0300) Subject: Fix bug #15155 with ignoring face remapping for strings from prefix properties. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~144 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c6014d4cc93c33a964acd246e792e1bd73f910d;p=emacs.git 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 e252e4a2f4f..bee477c745a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-08-23 Eli Zaretskii + + * 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 Minor cleanup for redisplay interface and few related functions. diff --git a/src/xdisp.c b/src/xdisp.c index 53fc6d85647..ca130473c0f 100644 --- 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); }