Mercurial > emacs

diff src/dispextern.h @ 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 48ba3f89c89f ec5f051c1eb0
children 042f282a2ed7
line wrap: on
line diff
--- a/src/dispextern.h	Tue Mar 22 17:58:23 2005 +0000
+++ b/src/dispextern.h	Wed Mar 23 10:40:00 2005 +0000
@@ -2770,7 +2770,7 @@
 int lookup_named_face P_ ((struct frame *, Lisp_Object, int, int));
 int smaller_face P_ ((struct frame *, int, int));
 int face_with_height P_ ((struct frame *, int, int));
-int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int));
+int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int, int));
 void init_frame_faces P_ ((struct frame *));
 void free_frame_faces P_ ((struct frame *));
 void recompute_basic_faces P_ ((struct frame *));