bug#15155: 24.3; wrap-prefix in adaptive-wrap-prefix-mode with variable-pitch has wrong face

[Eli Zaretskii <eliz@gnu.org>]

> Date: Thu, 22 Aug 2013 22:32:46 +0200
> From: Frank Fischer <frank.fischer@mathematik.tu-chemnitz.de>
> Cc: monnier@iro.umontreal.ca, 15155@debbugs.gnu.org
> 
> Am Thu, 22 Aug 2013 19:56:05 +0300
> schrieb Eli Zaretskii <eliz@gnu.org>:
> 
> > Can you build Emacs from the trunk?  I would like to ask you to try a
> > patch that might fix this in your use case.
> 
> Sure, I'd be happy to help ;)

Thank you.  Please try the patch below.  It should solve the problem
with the font; you will still need to make sure on the Lisp level that
the prefix has the right face, to get the color you want.

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2013-08-15 16:28:42 +0000
+++ src/xdisp.c	2013-08-22 16:57:56 +0000
@@ -3915,7 +3915,9 @@ handle_face_prop (struct it *it)
 	     surrounding text, unless they specify their own
 	     faces.  */
 	  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);
 	}