From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 24 Dec 2003 10:29:59 +0000 (+0000)
Subject: * xfaces.c (lface_fully_specified_p): Take into account that
X-Git-Tag: ttn-vms-21-2-B4~8189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5202d23dfe53de7a113c0d05561ad34a8a770715;p=emacs.git

* xfaces.c (lface_fully_specified_p): Take into account that
  MAC OS always have unspecified stipple.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b25a81ac60d..2633c55a6ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xfaces.c (lface_fully_specified_p): Take into account that
+	MAC OS always have unspecified stipple.
+
 2003-12-24  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* tparam.c (tparam1): Add handling for `%pN', which
diff --git a/src/xfaces.c b/src/xfaces.c
index 37a3cc1b0f0..f079e2e4484 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3186,7 +3186,13 @@ lface_fully_specified_p (attrs)
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX
 	&& i != LFACE_AVGWIDTH_INDEX)
-      if (UNSPECIFIEDP (attrs[i]))
+      if (UNSPECIFIEDP (attrs[i])
+#ifdef MAC_OS
+        /* MAC_TODO: No stipple support on Mac OS yet, this index is
+           always unspecified.  */
+          && i != LFACE_STIPPLE_INDEX
+#endif
+          )
         break;
 
   return i == LFACE_VECTOR_SIZE;