diff options
| author | Karoly Lorentey <[email protected]> | 2005-03-23 10:40:00 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-03-23 10:40:00 +0000 |
| commit | 76acbdc50490034f233bc78d14a7cd5717d9432e (patch) | |
| tree | 9b46877d371dad83ff6cdad30cd69df2a050de7d /src/dispextern.h | |
| parent | 335fcf6c2f6ae8990d8c62589cfb3558c3f38bc0 (diff) | |
| parent | 8725c7925ef1ce95efb1f50d48d17f437e9c46a4 (diff) | |
Merged from [email protected] (patch 192-203)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-192
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-193
Use gdb-ui breakpoint faces on ttys too
* [email protected]/emacs--cvs-trunk--0--patch-194
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-195
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-196
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-197
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-198
Tweak gdb-ui breakpoint faces
* [email protected]/emacs--cvs-trunk--0--patch-199
Tweak gdb-ui breakpoint faces
* [email protected]/emacs--cvs-trunk--0--patch-200
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-201
Tweak info/.arch-inventory to identify info/.cvsignore as source
* [email protected]/emacs--cvs-trunk--0--patch-202
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-203
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-316
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 8861a9705c..fbc816865b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2770,7 +2770,7 @@ int lookup_face P_ ((struct frame *, Lisp_Object *, int, struct face *)); 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 *)); |