Commit 6c6014d4 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 1df7c7ca
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.
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment