(lface_fully_specified_p): Handle :inherit.

(Finternal_set_lisp_face_attribute): Fix typo in error message.

diff --git a/src/ChangeLog b/src/ChangeLog
index fa1bea280d0d3bd39bc943c010d2e814d1927be8..6b847d3f35d70bbaf16958cee15236556b2517ed 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-27  Gerd Moellmann  <gerd@gnu.org>
+
+       * xfaces.c (lface_fully_specified_p): Handle :inherit.
+       (Finternal_set_lisp_face_attribute): Fix typo in error message.
+
 2000-08-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * Makefile.in (dispnew.o, indent.o, fontset.o, minibuf.o)

diff --git a/src/xfaces.c b/src/xfaces.c
index 1f7ab1c0ac0b693640a533a0d4c7ad091f25704c..17f9c5928bbb6297ebcee456bac5795984e34556 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2952,8 +2952,9 @@ lface_fully_specified_p (attrs)
   int i;
 
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
-    if (UNSPECIFIEDP (attrs[i]) && i != LFACE_FONT_INDEX)
-      break;
+    if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX)
+      if (UNSPECIFIEDP (attrs[i])) 
+        break;
 
   return i == LFACE_VECTOR_SIZE;
 }
@@ -3161,6 +3162,7 @@ merge_face_vectors (f, from, to, cycle_check)
   to[LFACE_INHERIT_INDEX] = Qnil;
 }
 
+
 /* Checks the `cycle check' variable CHECK to see if it indicates that
    EL is part of a cycle; CHECK must be either Qnil or a value returned
    by an earlier use of CYCLE_CHECK.  SUSPICIOUS is the number of
@@ -3173,6 +3175,7 @@ merge_face_vectors (f, from, to, cycle_check)
 
    CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
    the caller should make sure that's ok.  */
+
 #define CYCLE_CHECK(check, el, suspicious)                                   \
   (NILP (check)                                                                      \
    ? make_number (0)                                                         \
@@ -3886,7 +3889,7 @@ frame.")
       if (NILP (tail))
        LFACE_INHERIT (lface) = value;
       else
-       signal_error ("Invalid font inheritance", value);
+       signal_error ("Invalid face inheritance", value);
     }
   else if (EQ (attr, QCbold))
     {