From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Mon, 18 Apr 2005 11:34:46 +0000 (+0000)
Subject: (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
X-Git-Tag: ttn-vms-21-2-B4~925
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d603e3f8e85afcde9192526857daa7c238d6b90;p=emacs.git

(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 953c38dbdb9..da5010751f9 100644
--- 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 146036aa97e..3ff8917ff91 100644
--- 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;
 }