diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-06-21 15:42:45 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-06-21 15:42:45 +0000 |
commit | 7ab5f1440f3323fe51db8b74cfa18d44f9781d2f (patch) | |
tree | db2020ccde0b552630dc99b6d36fe4f93827aade /src/dispextern.h | |
parent | 3dbbd4584c7c48ad064289e27edcb84ce7dc72b9 (diff) | |
parent | 47d31923e058db07cd4d7aaf79a0b29836c8e3ac (diff) | |
download | emacs-7ab5f1440f3323fe51db8b74cfa18d44f9781d2f.tar.gz |
Merged from miles@gnu.org--gnu-2005 (patch 423-434)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-423
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-424
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
Remove "-face" suffix from gnus faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-426
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-427
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-428
Remove "-face" suffix from MH-E faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-429
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-430
Remove "-face" suffix from cc-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Remove "-face" suffix from eshell faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-433
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-434
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-351
Diffstat (limited to 'src/dispextern.h')
-rw-r--r-- | src/dispextern.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index df6bbd00eec..8648303af8c 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -366,7 +366,8 @@ struct glyph #define FACE_ID_BITS 21 - /* Face of the glyph. */ + /* Face of the glyph. This is a realized face ID, + an index in the face cache of the frame. */ unsigned face_id : FACE_ID_BITS; /* Type of font used to display the character glyph. May be used to @@ -2903,6 +2904,7 @@ Lisp_Object sit_for P_ ((int, int, int, int, int)); void init_display P_ ((void)); void syms_of_display P_ ((void)); extern Lisp_Object Qredisplay_dont_pause; +GLYPH spec_glyph_lookup_face P_ ((struct window *, GLYPH)); /* Defined in term.c */ |