Mercurial > emacs
diff src/dispextern.h @ 83212:f70dc61a797f
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581
Fix exec-shield autoconf test
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-583
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-587
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-588
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-589
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-590
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-591
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-592
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-39
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-40
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-41
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-252
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 03 Oct 2004 13:08:55 +0000 |
| parents | b85b19b8eb65 db333b320b67 |
| children | 4f2f1522636c |
line wrap: on
line diff
--- a/src/dispextern.h Wed Sep 29 08:38:15 2004 +0000 +++ b/src/dispextern.h Sun Oct 03 13:08:55 2004 +0000 @@ -104,7 +104,7 @@ }; /* Number of bits allocated to store fringe bitmap numbers. */ -#define FRINGE_ID_BITS 8 +#define FRINGE_ID_BITS 16 @@ -714,24 +714,24 @@ /* Left fringe bitmap number (enum fringe_bitmap_type). */ unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; + /* Right fringe bitmap number (enum fringe_bitmap_type). */ + unsigned right_user_fringe_bitmap : FRINGE_ID_BITS; + + /* Left fringe bitmap number (enum fringe_bitmap_type). */ + unsigned left_fringe_bitmap : FRINGE_ID_BITS; + + /* Right fringe bitmap number (enum fringe_bitmap_type). */ + unsigned right_fringe_bitmap : FRINGE_ID_BITS; + /* Face of the left fringe glyph. */ unsigned left_user_fringe_face_id : FACE_ID_BITS; - /* Right fringe bitmap number (enum fringe_bitmap_type). */ - unsigned right_user_fringe_bitmap : FRINGE_ID_BITS; - /* Face of the right fringe glyph. */ unsigned right_user_fringe_face_id : FACE_ID_BITS; - /* Left fringe bitmap number (enum fringe_bitmap_type). */ - unsigned left_fringe_bitmap : FRINGE_ID_BITS; - /* Face of the left fringe glyph. */ unsigned left_fringe_face_id : FACE_ID_BITS; - /* Right fringe bitmap number (enum fringe_bitmap_type). */ - unsigned right_fringe_bitmap : FRINGE_ID_BITS; - /* Face of the right fringe glyph. */ unsigned right_fringe_face_id : FACE_ID_BITS; @@ -2043,12 +2043,12 @@ /* Left fringe bitmap number (enum fringe_bitmap_type). */ unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; + /* Right fringe bitmap number (enum fringe_bitmap_type). */ + unsigned right_user_fringe_bitmap : FRINGE_ID_BITS; + /* Face of the left fringe glyph. */ unsigned left_user_fringe_face_id : FACE_ID_BITS; - /* Right fringe bitmap number (enum fringe_bitmap_type). */ - unsigned right_user_fringe_bitmap : FRINGE_ID_BITS; - /* Face of the right fringe glyph. */ unsigned right_user_fringe_face_id : FACE_ID_BITS; }; @@ -2630,7 +2630,7 @@ /* Defined in fringe.c */ -int valid_fringe_bitmap_p (Lisp_Object); +int lookup_fringe_bitmap (Lisp_Object); void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int)); void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *)); void draw_window_fringes P_ ((struct window *));