From d9fe43df46bd89b219898fd4cf21b22c5ef0f6f9 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 18 Apr 2005 11:38:09 +0000 Subject: [PATCH] (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL. --- src/ChangeLog | 4 ++++ src/xfaces.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 528b9973796..1a46e6cf914 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-04-18 Thien-Thi Nguyen + + * xfaces.c (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL. + 2005-04-18 Thien-Thi Nguyen * xmenu.c (Fx_popup_menu): Initialize error_name to NULL. diff --git a/src/xfaces.c b/src/xfaces.c index e620cb06dd7..80fd04b17a3 100644 --- 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; } -- 2.39.2