Mercurial > emacs

changeset 31202:1733db535955

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(lface_fully_specified_p): Handle :inherit. (Finternal_set_lisp_face_attribute): Fix typo in error message.
author Gerd Moellmann <gerd@gnu.org>
date Sun, 27 Aug 2000 11:28:37 +0000
parents 86d1a169a3cc
children 4c14695715f0
files src/xfaces.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Sun Aug 27 10:10:14 2000 +0000
+++ b/src/xfaces.c	Sun Aug 27 11:28:37 2000 +0000
@@ -2952,8 +2952,9 @@
   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 @@
   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 @@
 
    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 @@
       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))
     {