/[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.255.2.15 by miles, Tue Jul 6 10:17:22 2004 UTC revision 1.255.2.16 by miles, Tue Jul 6 10:27:02 2004 UTC
# Line 5848  x_supports_face_attributes_p (f, attrs, Line 5848  x_supports_face_attributes_p (f, attrs,
5848        face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));        face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
5849    
5850        if (! face)        if (! face)
5851          signal_error ("cannot make face", 0);          error ("cannot make face");
5852    
5853        /* If the font is the same, then not supported.  */        /* If the font is the same, then not supported.  */
5854        if (face->font == def_face->font)        if (face->font == def_face->font)
# Line 5883  tty_supports_face_attributes_p (f, attrs Line 5883  tty_supports_face_attributes_p (f, attrs
5883       Lisp_Object *attrs;       Lisp_Object *attrs;
5884       struct face *def_face;       struct face *def_face;
5885  {  {
5886    int weight, i;    int weight;
5887    Lisp_Object val, fg, bg;    Lisp_Object val, fg, bg;
5888    XColor fg_tty_color, fg_std_color;    XColor fg_tty_color, fg_std_color;
5889    XColor bg_tty_color, bg_std_color;    XColor bg_tty_color, bg_std_color;
# Line 6105  face for italic. */) Line 6105  face for italic. */)
6105    if (def_face == NULL)    if (def_face == NULL)
6106      {      {
6107        if (! realize_basic_faces (f))        if (! realize_basic_faces (f))
6108          signal_error ("Cannot realize default face", 0);          error ("Cannot realize default face");
6109        def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);        def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
6110      }      }
6111    

Legend:
Removed from v.1.255.2.15  
changed lines
  Added in v.1.255.2.16

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