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

[Kim F . Storm]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.316 emacs/src/xfaces.c:1.317
*** emacs/src/xfaces.c:1.316    Fri Mar 18 04:21:17 2005
--- emacs/src/xfaces.c  Tue Mar 22 23:02:03 2005
***************
*** 5775,5781 ****
     is assumed to be already realized.  */
  
  int
! lookup_derived_face (f, symbol, c, face_id)
       struct frame *f;
       Lisp_Object symbol;
       int c;
--- 5775,5781 ----
     is assumed to be already realized.  */
  
  int
! lookup_derived_face (f, symbol, c, face_id, signal_p)
       struct frame *f;
       Lisp_Object symbol;
       int c;
***************
*** 5788,5794 ****
    if (!default_face)
      abort ();
  
!   get_lface_attributes (f, symbol, symbol_attrs, 1);
    bcopy (default_face->lface, attrs, sizeof attrs);
    merge_face_vectors (f, symbol_attrs, attrs, 0);
    return lookup_face (f, attrs, c, default_face);
--- 5788,5794 ----
    if (!default_face)
      abort ();
  
!   get_lface_attributes (f, symbol, symbol_attrs, signal_p);
    bcopy (default_face->lface, attrs, sizeof attrs);
    merge_face_vectors (f, symbol_attrs, attrs, 0);
    return lookup_face (f, attrs, c, default_face);
***************
*** 7731,7737 ****
        if (face_id < 0 || face_id >= lface_id_to_name_size)
        return base_face_id;
        face_name = lface_id_to_name[face_id];
!       face_id = lookup_derived_face (f, face_name, 0, base_face_id);
        if (face_id >= 0)
        return face_id;
        return base_face_id;
--- 7731,7737 ----
        if (face_id < 0 || face_id >= lface_id_to_name_size)
        return base_face_id;
        face_name = lface_id_to_name[face_id];
!       face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1);
        if (face_id >= 0)
        return face_id;
        return base_face_id;