From 67aecef9f5192d2ab0cee83befc4e2c31fcdf806 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 6 Jul 2010 16:24:57 -0400 Subject: [PATCH] * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get fringe face id, so face-remapping-alist works (Bug#6091). --- src/ChangeLog | 5 +++++ src/fringe.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c0c94ebea8..4cc649eccc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-06 Chong Yidong + + * 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 * w32.c, w32console.c, w32fns.c, w32font.c, w32heap.c, w32inevt.c diff --git a/src/fringe.c b/src/fringe.c index 9e1d7003d4..b2cff34ba5 100644 --- 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; } -- 2.20.1