comparison src/dispextern.h @ 90072:cb67264d6096

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents f6b4d0ebf147 08a75ace96a6
children befae6bafecb
comparison
equal deleted inserted replaced
90071:f6b4d0ebf147 90072:cb67264d6096
1838 Lisp_Object *dpvec, *dpend; 1838 Lisp_Object *dpvec, *dpend;
1839 1839
1840 /* Length in bytes of the char that filled dpvec. A value of zero 1840 /* Length in bytes of the char that filled dpvec. A value of zero
1841 means that no such character is involved. */ 1841 means that no such character is involved. */
1842 int dpvec_char_len; 1842 int dpvec_char_len;
1843
1844 /* Face id to use for all characters in display vector. -1 if unused. */
1845 int dpvec_face_id;
1843 1846
1844 /* Face id of the iterator saved in case a glyph from dpvec contains 1847 /* Face id of the iterator saved in case a glyph from dpvec contains
1845 a face. The face is restored when all glyphs from dpvec have 1848 a face. The face is restored when all glyphs from dpvec have
1846 been delivered. */ 1849 been delivered. */
1847 int saved_face_id; 1850 int saved_face_id;
2753 void recompute_basic_faces P_ ((struct frame *)); 2756 void recompute_basic_faces P_ ((struct frame *));
2754 int face_at_buffer_position P_ ((struct window *, int, int, int, int *, 2757 int face_at_buffer_position P_ ((struct window *, int, int, int, int *,
2755 int, int)); 2758 int, int));
2756 int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int, 2759 int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
2757 int, int *, enum face_id, int)); 2760 int, int *, enum face_id, int));
2761 int merge_faces P_ ((struct frame *, Lisp_Object, int, int));
2758 int compute_char_face P_ ((struct frame *, int, Lisp_Object)); 2762 int compute_char_face P_ ((struct frame *, int, Lisp_Object));
2759 void free_all_realized_faces P_ ((Lisp_Object)); 2763 void free_all_realized_faces P_ ((Lisp_Object));
2760 void free_realized_face P_ ((struct frame *, struct face *)); 2764 void free_realized_face P_ ((struct frame *, struct face *));
2761 extern Lisp_Object Qforeground_color, Qbackground_color; 2765 extern Lisp_Object Qforeground_color, Qbackground_color;
2762 extern char unspecified_fg[], unspecified_bg[]; 2766 extern char unspecified_fg[], unspecified_bg[];