mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.

Browse Source
This commit is contained in:
Thien-Thi Nguyen 2005-04-18 11:34:46 +00:00
parent cae0724067
commit 7d603e3f8e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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> 2005-04-18 Lute Kamstra <lute@gnu.org>
* lread.c (Vloads_in_progress): Static. * lread.c (Vloads_in_progress): Static.

5
src/xfaces.c
View File

@ -7084,8 +7084,9 @@ realize_x_face (cache, attrs, c, base_face)
int c; int c;
struct face *base_face; struct face *base_face;
{ {
struct face *face = NULL;
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
struct face *face, *default_face; struct face *default_face;
struct frame *f; struct frame *f;
Lisp_Object stipple, overline, strike_through, box; 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); face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h);
xassert (FACE_SUITABLE_FOR_CHAR_P (face, c)); xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
return face;
#endif /* HAVE_WINDOW_SYSTEM */ #endif /* HAVE_WINDOW_SYSTEM */
return face;
} }