Mercurial > emacs
changeset 109153:978941230a7c
* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
fringe face id, so face-remapping-alist works (Bug#6091).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 06 Jul 2010 16:24:57 -0400 |
| parents | e27859da5624 |
| children | 6f7fb6d5f0f9 812261a6ffd2 |
| files | src/ChangeLog src/fringe.c |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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; }