diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-06 16:24:57 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-06 16:24:57 -0400 |
| commit | 67aecef9f5192d2ab0cee83befc4e2c31fcdf806 (patch) | |
| tree | daa799852de258413e07dd55a1c588b0eff75285 /src/fringe.c | |
| parent | b56ceb92bf4d470af2e9172d1fcd4d85232c40a6 (diff) | |
| download | emacs-67aecef9f5192d2ab0cee83befc4e2c31fcdf806.tar.gz | |
* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
fringe face id, so face-remapping-alist works (Bug#6091).
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/fringe.c b/src/fringe.c index 9e1d7003d4f..b2cff34ba57 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; } |