# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1278447897 14400
# Node ID 978941230a7c3d99d777901901e6e5984927ddee
# Parent  e27859da5624c8ded3c691b65143a54f7e1b748f
* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
fringe face id, so face-remapping-alist works (Bug#6091).

diff -r e27859da5624 -r 978941230a7c src/ChangeLog
--- a/src/ChangeLog	Tue Jul 06 16:22:29 2010 +0200
+++ b/src/ChangeLog	Tue Jul 06 16:24:57 2010 -0400
@@ -1,3 +1,8 @@
+2010-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+	* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
+	fringe face id, so face-remapping-alist works (Bug#6091).
+
 2010-07-06  Juanma Barranquero  <lekktu@gmail.com>
 
 	* w32.c, w32console.c, w32fns.c, w32font.c, w32heap.c, w32inevt.c
diff -r e27859da5624 -r 978941230a7c src/fringe.c
--- a/src/fringe.c	Tue Jul 06 16:22:29 2010 +0200
+++ b/src/fringe.c	Tue Jul 06 16:24:57 2010 -0400
@@ -576,11 +576,10 @@
 
   if (face_id == DEFAULT_FACE_ID)
     {
-      Lisp_Object face;
-
-      if ((face = fringe_faces[which], NILP (face))
-	  || (face_id = lookup_derived_face (f, face, FRINGE_FACE_ID, 0),
-	      face_id < 0))
+      Lisp_Object face = fringe_faces[which];
+      face_id = NILP (face) ? lookup_named_face (f, Qfringe, 0)
+	: lookup_derived_face (f, face, FRINGE_FACE_ID, 0);
+      if (face_id < 0)
 	face_id = FRINGE_FACE_ID;
     }