martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
fringe face id, so face-remapping-alist works (Bug#6091).
This commit is contained in:
Chong Yidong
2010-07-06 16:24:57 -04:00
parent b56ceb92bf
commit 67aecef9f5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -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

9
src/fringe.c
View File

@@ -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;
}