Mercurial > emacs

changeset 60837:18fb43577f76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(lookup_derived_face): Add arg SIGNAL_P.
author Kim F. Storm <storm@cua.dk>
date Tue, 22 Mar 2005 23:02:03 +0000
parents 9b2dec143458
children a30123aa4b4a
files src/xfaces.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Tue Mar 22 23:01:17 2005 +0000
+++ b/src/xfaces.c	Tue Mar 22 23:02:03 2005 +0000
@@ -5775,7 +5775,7 @@
    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 @@
   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 @@
       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;