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

[Thien-Thi Nguyen]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.317 emacs/src/xfaces.c:1.318
*** emacs/src/xfaces.c:1.317    Tue Mar 22 23:02:03 2005
--- emacs/src/xfaces.c  Mon Apr 18 11:32:29 2005
***************
*** 7084,7091 ****
       int c;
       struct face *base_face;
  {
  #ifdef HAVE_WINDOW_SYSTEM
!   struct face *face, *default_face;
    struct frame *f;
    Lisp_Object stipple, overline, strike_through, box;
  
--- 7084,7092 ----
       int c;
       struct face *base_face;
  {
+   struct face *face = NULL;
  #ifdef HAVE_WINDOW_SYSTEM
!   struct face *default_face;
    struct frame *f;
    Lisp_Object stipple, overline, strike_through, box;
  
***************
*** 7281,7288 ****
      face->stipple = load_pixmap (f, stipple, &face->pixmap_w, 
&face->pixmap_h);
  
    xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
-   return face;
  #endif /* HAVE_WINDOW_SYSTEM */
  }
  
  
--- 7282,7289 ----
      face->stipple = load_pixmap (f, stipple, &face->pixmap_w, 
&face->pixmap_h);
  
    xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
  #endif /* HAVE_WINDOW_SYSTEM */
+   return face;
  }