Mercurial > emacs

diff src/xfaces.c @ 83276:26c9034f3533

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 192-203) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-192 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193 Use gdb-ui breakpoint faces on ttys too * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-194 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-195 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-196 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-197 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-198 Tweak gdb-ui breakpoint faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-199 Tweak gdb-ui breakpoint faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-200 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-201 Tweak info/.arch-inventory to identify info/.cvsignore as source * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-202 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-203 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-316
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 23 Mar 2005 10:40:00 +0000
parents 1830bcd0eec0 18fb43577f76
children b4b67a7fcbe0
line wrap: on
line diff
--- a/src/xfaces.c	Tue Mar 22 17:58:23 2005 +0000
+++ b/src/xfaces.c	Wed Mar 23 10:40:00 2005 +0000
@@ -5778,7 +5778,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;
@@ -5791,7 +5791,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);
@@ -7740,7 +7740,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;