aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2005-03-22 23:00:44 +0000
committerKim F. Storm2005-03-22 23:00:44 +0000
commit308785c1247c6e3bb972aefb5b792070e5619d0f (patch)
treeaf59a31b08d891c0041288c42a57fc2b3501d5f0 /src
parent19aaca78a766e565ddfd5c4cc8b3d6a5a438f156 (diff)
downloademacs-308785c1247c6e3bb972aefb5b792070e5619d0f.tar.gz
emacs-308785c1247c6e3bb972aefb5b792070e5619d0f.zip
(draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Derive face from fringe face.
Diffstat (limited to 'src')
-rw-r--r--src/fringe.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fringe.c b/src/fringe.c
index 9e9d6be081c..f375159c8bc 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -551,7 +551,8 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which)
551 Lisp_Object face; 551 Lisp_Object face;
552 552
553 if ((face = fringe_faces[which], NILP (face)) 553 if ((face = fringe_faces[which], NILP (face))
554 || (face_id = lookup_named_face (f, face, 'A', 1), face_id < 0)) 554 || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0),
555 face_id < 0))
555 face_id = FRINGE_FACE_ID; 556 face_id = FRINGE_FACE_ID;
556 } 557 }
557 558
@@ -1360,7 +1361,8 @@ If FACE is nil, reset face to default fringe face. */)
1360 1361
1361 if (!NILP (face)) 1362 if (!NILP (face))
1362 { 1363 {
1363 face_id = lookup_named_face (SELECTED_FRAME (), face, 'A', 1); 1364 face_id = lookup_derived_face (SELECTED_FRAME (), face,
1365 'A', FRINGE_FACE_ID, 1);
1364 if (face_id < 0) 1366 if (face_id < 0)
1365 error ("No such face"); 1367 error ("No such face");
1366 } 1368 }