[Emacs-diffs] /srv/bzr/emacs/trunk r100735: * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get

[Chong Yidong]

------------------------------------------------------------
revno: 100735
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-07-06 16:24:57 -0400
message:
  * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
  fringe face id, so face-remapping-alist works (Bug#6091).
modified:
  src/ChangeLog
  src/fringe.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-06 14:22:29 +0000
+++ b/src/ChangeLog     2010-07-06 20:24:57 +0000
@@ -1,3 +1,8 @@
+2010-07-06  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32.c, w32console.c, w32fns.c, w32font.c, w32heap.c, w32inevt.c

=== modified file 'src/fringe.c'
--- a/src/fringe.c      2010-07-04 07:50:25 +0000
+++ b/src/fringe.c      2010-07-06 20:24:57 +0000
@@ -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;
     }