From: Kim F. Storm <storm@cua.dk>
Date: Tue, 22 Mar 2005 23:02:03 +0000 (+0000)
Subject: (lookup_derived_face): Add arg SIGNAL_P.
X-Git-Tag: ttn-vms-21-2-B4~1613
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d196a54737897fdd4a19ca62034f53ce731d5f20;p=emacs.git

(lookup_derived_face): Add arg SIGNAL_P.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 753b20765d8..146036aa97e 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5775,7 +5775,7 @@ face_with_height (f, face_id, height)
    is assumed to be already realized.  */
 
 int
-lookup_derived_face (f, symbol, c, face_id)
+lookup_derived_face (f, symbol, c, face_id, signal_p)
      struct frame *f;
      Lisp_Object symbol;
      int c;
@@ -5788,7 +5788,7 @@ lookup_derived_face (f, symbol, c, face_id)
   if (!default_face)
     abort ();
 
-  get_lface_attributes (f, symbol, symbol_attrs, 1);
+  get_lface_attributes (f, symbol, symbol_attrs, signal_p);
   bcopy (default_face->lface, attrs, sizeof attrs);
   merge_face_vectors (f, symbol_attrs, attrs, 0);
   return lookup_face (f, attrs, c, default_face);
@@ -7731,7 +7731,7 @@ merge_faces (f, face_name, face_id, base_face_id)
       if (face_id < 0 || face_id >= lface_id_to_name_size)
 	return base_face_id;
       face_name = lface_id_to_name[face_id];
-      face_id = lookup_derived_face (f, face_name, 0, base_face_id);
+      face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1);
       if (face_id >= 0)
 	return face_id;
       return base_face_id;