aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorJoakim Verona2011-12-28 04:12:56 +0100
committerJoakim Verona2011-12-28 04:12:56 +0100
commitbb29f044aa967831cd664c54eba0de0c701436ce (patch)
tree1398cc9780bbae0fdad071a3a3765a571c3f6d7b /src/xfaces.c
parent3c935a7e996701244d166f684119f0ff97e25496 (diff)
parent5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff)
downloademacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip
upstream i think
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 849ad6bbdf4..7e3ce4103d9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -66,7 +66,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
66 attributes (1st thru 5th) are updated from the spec. 66 attributes (1st thru 5th) are updated from the spec.
67 67
68 On the other hand, if one of the other font-related attributes are 68 On the other hand, if one of the other font-related attributes are
69 specified, the correspoinding specs in this attribute is set to nil. 69 specified, the corresponding specs in this attribute is set to nil.
70 70
71 15. A face name or list of face names from which to inherit attributes. 71 15. A face name or list of face names from which to inherit attributes.
72 72
@@ -1223,7 +1223,7 @@ face_color_gray_p (struct frame *f, const char *color_name)
1223 int gray_p; 1223 int gray_p;
1224 1224
1225 if (defined_color (f, color_name, &color, 0)) 1225 if (defined_color (f, color_name, &color, 0))
1226 gray_p = (/* Any color sufficiently close to black counts as grey. */ 1226 gray_p = (/* Any color sufficiently close to black counts as gray. */
1227 (color.red < 5000 && color.green < 5000 && color.blue < 5000) 1227 (color.red < 5000 && color.green < 5000 && color.blue < 5000)
1228 || 1228 ||
1229 ((eabs (color.red - color.green) 1229 ((eabs (color.red - color.green)