diff src/fringe.c @ 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 aec1143e8d85
children 750db9f3e6d8
line wrap: on
line diff
--- 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;
     }