aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2004-04-09 16:15:08 +0000
committerStefan Monnier2004-04-09 16:15:08 +0000
commit066a4c6b91d04c1b77c670c1dbd63ea036e3e411 (patch)
tree9a0c1eaa835717dbe136ae823663e89d21c11816 /src
parent7b30b20c7e8009bf7662088d370c7558f181939f (diff)
downloademacs-066a4c6b91d04c1b77c670c1dbd63ea036e3e411.tar.gz
emacs-066a4c6b91d04c1b77c670c1dbd63ea036e3e411.zip
(face_color_supported_p): Fix compilation without X11.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index d8034c1d5d7..b96dd18ec4d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,5 +1,5 @@
1/* xfaces.c -- "Face" primitives. 1/* xfaces.c -- "Face" primitives.
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003 2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -1505,15 +1505,19 @@ face_color_supported_p (f, color_name, background_p)
1505 XColor not_used; 1505 XColor not_used;
1506 1506
1507 XSETFRAME (frame, f); 1507 XSETFRAME (frame, f);
1508 return (FRAME_WINDOW_P (f) 1508 return
1509 ? (!NILP (Fxw_display_color_p (frame)) 1509#ifdef HAVE_X_WINDOWS
1510 || xstricmp (color_name, "black") == 0 1510 FRAME_WINDOW_P (f)
1511 || xstricmp (color_name, "white") == 0 1511 ? (!NILP (Fxw_display_color_p (frame))
1512 || (background_p 1512 || xstricmp (color_name, "black") == 0
1513 && face_color_gray_p (f, color_name)) 1513 || xstricmp (color_name, "white") == 0
1514 || (!NILP (Fx_display_grayscale_p (frame)) 1514 || (background_p
1515 && face_color_gray_p (f, color_name))) 1515 && face_color_gray_p (f, color_name))
1516 : tty_defined_color (f, color_name, &not_used, 0)); 1516 || (!NILP (Fx_display_grayscale_p (frame))
1517 && face_color_gray_p (f, color_name)))
1518 :
1519#endif
1520 tty_defined_color (f, color_name, &not_used, 0);
1517} 1521}
1518 1522
1519 1523