[Emacs-diffs] Changes to emacs/src/fringe.c

[Kim F . Storm]

Index: emacs/src/fringe.c
diff -c emacs/src/fringe.c:1.25 emacs/src/fringe.c:1.26
*** emacs/src/fringe.c:1.25     Sun Jan 16 09:59:03 2005
--- emacs/src/fringe.c  Tue Mar 22 23:00:44 2005
***************
*** 551,557 ****
        Lisp_Object face;
  
        if ((face = fringe_faces[which], NILP (face))
!         || (face_id = lookup_named_face (f, face, 'A', 1), face_id < 0))
        face_id = FRINGE_FACE_ID;
      }
  
--- 551,558 ----
        Lisp_Object face;
  
        if ((face = fringe_faces[which], NILP (face))
!         || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0),
!             face_id < 0))
        face_id = FRINGE_FACE_ID;
      }
  
***************
*** 1360,1366 ****
  
    if (!NILP (face))
      {
!       face_id = lookup_named_face (SELECTED_FRAME (), face, 'A', 1);
        if (face_id < 0)
        error ("No such face");
      }
--- 1361,1368 ----
  
    if (!NILP (face))
      {
!       face_id = lookup_derived_face (SELECTED_FRAME (), face,
!                                    'A', FRINGE_FACE_ID, 1);
        if (face_id < 0)
        error ("No such face");
      }