From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 4 Jun 2004 15:56:53 +0000 (+0000)
Subject: (x_supports_face_attributes_p): Make this function
X-Git-Tag: ttn-vms-21-2-B4~5945
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ccda4e3cef99aab9f620b587462cad5a1a54d236;p=emacs.git

(x_supports_face_attributes_p): Make this function
conditional on HAVE_WINDOW_SYSTEM.
(Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]: Don't
call x_supports_face_attributes_p if it was not compiled in.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index bd19d32c990..7937cc5e430 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5740,6 +5740,7 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector,
 
 #define TTY_SAME_COLOR_THRESHOLD  10000
 
+#ifdef HAVE_WINDOW_SYSTEM
 
 /* Return non-zero if all the face attributes in ATTRS are supported
    on the window-system frame F.
@@ -5828,6 +5829,7 @@ x_supports_face_attributes_p (f, attrs)
   return 1;
 }
 
+#endif	/* HAVE_WINDOW_SYSTEM */
 
 /* Return non-zero if all the face attributes in ATTRS are supported
    on the tty frame F.
@@ -6042,8 +6044,10 @@ face for italic. */)
   /* Dispatch to the appropriate handler.  */
   if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
     supports = tty_supports_face_attributes_p (f, attrs);
+#ifdef HAVE_WINDOW_SYSTEM
   else
     supports = x_supports_face_attributes_p (f, attrs);
+#endif	/* HAVE_WINDOW_SYSTEM */
 
   return supports ? Qt : Qnil;
 }