(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.

diff --git a/src/ChangeLog b/src/ChangeLog
index 953c38dbdb96745cea56d75dad83cfc5151f2a4b..da5010751f9c0bb6c12e2e037e2d43a8d24562c8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * xfaces.c (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
+
 2005-04-18  Lute Kamstra  <lute@gnu.org>
 
        * lread.c (Vloads_in_progress): Static.

diff --git a/src/xfaces.c b/src/xfaces.c
index 146036aa97eadd95c3e505ec723be65bf59924c2..3ff8917ff91989040ab4af9023b600a168d14886 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7084,8 +7084,9 @@ realize_x_face (cache, attrs, c, base_face)
      int c;
      struct face *base_face;
 {
+  struct face *face = NULL;
 #ifdef HAVE_WINDOW_SYSTEM
-  struct face *face, *default_face;
+  struct face *default_face;
   struct frame *f;
   Lisp_Object stipple, overline, strike_through, box;
 
@@ -7281,8 +7282,8 @@ realize_x_face (cache, attrs, c, base_face)
     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 */
+  return face;
 }