Mercurial > emacs

diff src/dispextern.h @ 90128:13796b0653c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 192-205) - Update from CVS - Use gdb-ui breakpoint faces on ttys too - Tweak gdb-ui breakpoint faces - Tweak info/.arch-inventory to identify info/.cvsignore as source - Clean up gdb-ui breakpoint faces
author Miles Bader <miles@gnu.org>
date Thu, 24 Mar 2005 18:41:26 +0000
parents e330fedc9152 ec5f051c1eb0
children e1fbb019c538
line wrap: on
line diff
--- a/src/dispextern.h	Sat Mar 19 02:42:17 2005 +0000
+++ b/src/dispextern.h	Thu Mar 24 18:41:26 2005 +0000
@@ -2777,7 +2777,7 @@
 int lookup_named_face P_ ((struct frame *, Lisp_Object, 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 lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int));
 void init_frame_faces P_ ((struct frame *));
 void free_frame_faces P_ ((struct frame *));
 void recompute_basic_faces P_ ((struct frame *));