diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-10-03 13:08:55 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-10-03 13:08:55 +0000 |
| commit | c783f4429ed706dec8b7d581f24bd8b3b5efb9d4 (patch) | |
| tree | 87b2ea16c7be0e7d52014ca4d18c651b39a3b523 /src/dispextern.h | |
| parent | 844c86425118d4363d8437a6703e44736b9b56f9 (diff) | |
| parent | 3bd5b9995feed1a66c32bac9814379c649829da9 (diff) | |
| download | emacs-c783f4429ed706dec8b7d581f24bd8b3b5efb9d4.tar.gz | |
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
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 440c127508e..7bf3149e1b9 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -104,7 +104,7 @@ enum window_part }; /* Number of bits allocated to store fringe bitmap numbers. */ -#define FRINGE_ID_BITS 8 +#define FRINGE_ID_BITS 16 @@ -714,24 +714,24 @@ struct glyph_row /* Left fringe bitmap number (enum fringe_bitmap_type). */ unsigned left_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; - /* 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 left fringe glyph. */ + unsigned left_user_fringe_face_id : FACE_ID_BITS; + + /* Face of the right fringe glyph. */ + unsigned right_user_fringe_face_id : FACE_ID_BITS; + + /* Face of the left fringe glyph. */ + unsigned left_fringe_face_id : FACE_ID_BITS; + /* Face of the right fringe glyph. */ unsigned right_fringe_face_id : FACE_ID_BITS; @@ -2043,12 +2043,12 @@ struct it /* Left fringe bitmap number (enum fringe_bitmap_type). */ unsigned left_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 left fringe glyph. */ + unsigned left_user_fringe_face_id : FACE_ID_BITS; + /* Face of the right fringe glyph. */ unsigned right_user_fringe_face_id : FACE_ID_BITS; }; @@ -2630,7 +2630,7 @@ extern int x_intersect_rectangles P_ ((XRectangle *, XRectangle *, /* 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 *)); |