[!HAVE_WINDOW_SYSTEM] (FACE_SUITABLE_FOR_CHAR_P,

FACE_FOR_CHAR): Define them differently for the configuration of
--without-x.

diff --git a/src/ChangeLog b/src/ChangeLog
index e281662c2e84ef935cc4a850536e80fef24eaf7a..b334a56ab981bff5dcfd0d13e4952e46bde41a54 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,8 @@
 2000-03-22  Kenichi Handa  <handa@etl.go.jp>
 
-       * 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  <fx@gnu.org>
 

diff --git a/src/dispextern.h b/src/dispextern.h
index 34dd9712c86f9351ff2904baa14c2038ce6fb2a2..355454a42170ecf0f27a8eae7646c61042ebf997 100644 (file)
--- 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.  */