From ff1a0d8e5b71fa7a031eb464d6c750fea8e67ad8 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 22 Mar 2000 01:58:18 +0000 Subject: [PATCH] [!HAVE_WINDOW_SYSTEM] (FACE_SUITABLE_FOR_CHAR_P, FACE_FOR_CHAR): Define them differently for the configuration of --without-x. --- src/ChangeLog | 6 +++--- src/dispextern.h | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e281662c2e8..b334a56ab98 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,8 @@ 2000-03-22 Kenichi Handa - * dispextern.h: Define FACE_SUITABLE_FOR_CHAR_P and FACE_FOR_CHAR - differently for the configuration of --without-x by "ifdef - HAVE_WINDOW_SYSTEM". + * dispextern.h [!HAVE_WINDOW_SYSTEM] (FACE_SUITABLE_FOR_CHAR_P, + FACE_FOR_CHAR): Define them differently for the configuration of + --without-x. 2000-03-21 Dave Love diff --git a/src/dispextern.h b/src/dispextern.h index 34dd9712c86..355454a4217 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1330,6 +1330,8 @@ struct face_cache ? FRAME_FACE_CACHE (F)->faces_by_id[ID] \ : NULL) +#ifdef HAVE_WINDOW_SYSTEM + /* Non-zero if FACE is suitable for displaying character CHAR. */ #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) \ @@ -1346,9 +1348,12 @@ struct face_cache ? (FACE)->ascii_face->id \ : face_for_char ((F), (FACE), (CHAR))) -/* The default registry and encoding to use. */ +#else /* not HAVE_WINDOW_SYSTEM */ -extern Lisp_Object Vface_default_registry; +#define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1 +#define FACE_FOR_CHAR(F, FACE, CHAR) ((FACE)->id) + +#endif /* not HAVE_WINDOW_SYSTEM */ /* Non-zero means face attributes have been changed since the last redisplay. Used in redisplay_internal. */ -- 2.39.5