(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.

diff --git a/src/ChangeLog b/src/ChangeLog
index 528b99737968685d6ac3596c084494ac8ff8de1c..1a46e6cf914639808f27dd64d6849ac7fcfb558d 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  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * xmenu.c (Fx_popup_menu): Initialize error_name to NULL.

diff --git a/src/xfaces.c b/src/xfaces.c
index e620cb06dd76095cae7bc3396753a9be1d086ec0..80fd04b17a30fa79e6a478c39007f01e007430ff 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6278,8 +6278,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;
 
@@ -6487,8 +6488,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;
 }