/[emacs]/emacs/src/xfaces.c
ViewVC logotype

Diff of /emacs/src/xfaces.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.316 by monnier, Fri Mar 18 04:21:17 2005 UTC revision 1.317 by kfstorm, Tue Mar 22 23:02:03 2005 UTC
# Line 5775  face_with_height (f, face_id, height) Line 5775  face_with_height (f, face_id, height)
5775     is assumed to be already realized.  */     is assumed to be already realized.  */
5776    
5777  int  int
5778  lookup_derived_face (f, symbol, c, face_id)  lookup_derived_face (f, symbol, c, face_id, signal_p)
5779       struct frame *f;       struct frame *f;
5780       Lisp_Object symbol;       Lisp_Object symbol;
5781       int c;       int c;
# Line 5788  lookup_derived_face (f, symbol, c, face_ Line 5788  lookup_derived_face (f, symbol, c, face_
5788    if (!default_face)    if (!default_face)
5789      abort ();      abort ();
5790    
5791    get_lface_attributes (f, symbol, symbol_attrs, 1);    get_lface_attributes (f, symbol, symbol_attrs, signal_p);
5792    bcopy (default_face->lface, attrs, sizeof attrs);    bcopy (default_face->lface, attrs, sizeof attrs);
5793    merge_face_vectors (f, symbol_attrs, attrs, 0);    merge_face_vectors (f, symbol_attrs, attrs, 0);
5794    return lookup_face (f, attrs, c, default_face);    return lookup_face (f, attrs, c, default_face);
# Line 7731  merge_faces (f, face_name, face_id, base Line 7731  merge_faces (f, face_name, face_id, base
7731        if (face_id < 0 || face_id >= lface_id_to_name_size)        if (face_id < 0 || face_id >= lface_id_to_name_size)
7732          return base_face_id;          return base_face_id;
7733        face_name = lface_id_to_name[face_id];        face_name = lface_id_to_name[face_id];
7734        face_id = lookup_derived_face (f, face_name, 0, base_face_id);        face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1);
7735        if (face_id >= 0)        if (face_id >= 0)
7736          return face_id;          return face_id;
7737        return base_face_id;        return base_face_id;

Legend:
Removed from v.1.316  
changed lines
  Added in v.1.317

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26