aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2004-06-04 15:56:53 +0000
committerEli Zaretskii2004-06-04 15:56:53 +0000
commitccda4e3cef99aab9f620b587462cad5a1a54d236 (patch)
treec35466d05913db6c78e53e274e72476eab60c644 /src
parent1151d6175bf9fd0b9b9c3b8ad6f61a3ae9d61776 (diff)
downloademacs-ccda4e3cef99aab9f620b587462cad5a1a54d236.tar.gz
emacs-ccda4e3cef99aab9f620b587462cad5a1a54d236.zip
(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.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c4
1 files changed, 4 insertions, 0 deletions
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,
5740 5740
5741#define TTY_SAME_COLOR_THRESHOLD 10000 5741#define TTY_SAME_COLOR_THRESHOLD 10000
5742 5742
5743#ifdef HAVE_WINDOW_SYSTEM
5743 5744
5744/* Return non-zero if all the face attributes in ATTRS are supported 5745/* Return non-zero if all the face attributes in ATTRS are supported
5745 on the window-system frame F. 5746 on the window-system frame F.
@@ -5828,6 +5829,7 @@ x_supports_face_attributes_p (f, attrs)
5828 return 1; 5829 return 1;
5829} 5830}
5830 5831
5832#endif /* HAVE_WINDOW_SYSTEM */
5831 5833
5832/* Return non-zero if all the face attributes in ATTRS are supported 5834/* Return non-zero if all the face attributes in ATTRS are supported
5833 on the tty frame F. 5835 on the tty frame F.
@@ -6042,8 +6044,10 @@ face for italic. */)
6042 /* Dispatch to the appropriate handler. */ 6044 /* Dispatch to the appropriate handler. */
6043 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) 6045 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
6044 supports = tty_supports_face_attributes_p (f, attrs); 6046 supports = tty_supports_face_attributes_p (f, attrs);
6047#ifdef HAVE_WINDOW_SYSTEM
6045 else 6048 else
6046 supports = x_supports_face_attributes_p (f, attrs); 6049 supports = x_supports_face_attributes_p (f, attrs);
6050#endif /* HAVE_WINDOW_SYSTEM */
6047 6051
6048 return supports ? Qt : Qnil; 6052 return supports ? Qt : Qnil;
6049} 6053}