* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get

fringe face id, so face-remapping-alist works (Bug#6091).

diff --git a/src/ChangeLog b/src/ChangeLog
index c0c94ebea8901128b9ee07cc100d026468d30b18..4cc649eccc14b77fa65a8f21bcad7d2854d823df 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/fringe.c b/src/fringe.c
index 9e1d7003d4f9c0e9e040cb9bd47a05179fac3bb6..b2cff34ba573d991e589e01b7ab5c620d532a070 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -576,11 +576,10 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o
 
   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;
     }