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

[Stefan Monnier]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.301 emacs/src/xfaces.c:1.302
*** emacs/src/xfaces.c:1.301    Mon Jun 21 03:26:32 2004
--- emacs/src/xfaces.c  Wed Jun 30 19:35:18 2004
***************
*** 5848,5854 ****
        face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
  
        if (! face)
!       signal_error ("cannot make face", 0);
  
        /* If the font is the same, then not supported.  */
        if (face->font == def_face->font)
--- 5848,5854 ----
        face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
  
        if (! face)
!       error ("cannot make face");
  
        /* If the font is the same, then not supported.  */
        if (face->font == def_face->font)
***************
*** 5883,5889 ****
       Lisp_Object *attrs;
       struct face *def_face;
  {
!   int weight, i;
    Lisp_Object val, fg, bg;
    XColor fg_tty_color, fg_std_color;
    XColor bg_tty_color, bg_std_color;
--- 5883,5889 ----
       Lisp_Object *attrs;
       struct face *def_face;
  {
!   int weight;
    Lisp_Object val, fg, bg;
    XColor fg_tty_color, fg_std_color;
    XColor bg_tty_color, bg_std_color;
***************
*** 6105,6111 ****
    if (def_face == NULL)
      {
        if (! realize_basic_faces (f))
!       signal_error ("Cannot realize default face", 0);
        def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
      }
  
--- 6105,6111 ----
    if (def_face == NULL)
      {
        if (! realize_basic_faces (f))
!       error ("Cannot realize default face");
        def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
      }