Mercurial > emacs
comparison src/fringe.c @ 83227:3ec251523b3e
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 13 Nov 2004 18:34:40 +0000 |
parents | 4f2f1522636c fb4cd138f0b8 |
children | 2a3f27a45698 |
comparison
equal
deleted
inserted
replaced
83226:9ea0f6980511 | 83227:3ec251523b3e |
---|---|
929 right = NO_FRINGE_BITMAP; | 929 right = NO_FRINGE_BITMAP; |
930 | 930 |
931 if (force_p | 931 if (force_p |
932 || row->y != cur->y | 932 || row->y != cur->y |
933 || row->visible_height != cur->visible_height | 933 || row->visible_height != cur->visible_height |
934 || row->ends_at_zv_p != cur->ends_at_zv_p | |
934 || left != cur->left_fringe_bitmap | 935 || left != cur->left_fringe_bitmap |
935 || right != cur->right_fringe_bitmap | 936 || right != cur->right_fringe_bitmap |
936 || left_face_id != cur->left_fringe_face_id | 937 || left_face_id != cur->left_fringe_face_id |
937 || right_face_id != cur->right_fringe_face_id | 938 || right_face_id != cur->right_fringe_face_id |
938 || cur->redraw_fringe_bitmaps_p) | 939 || cur->redraw_fringe_bitmaps_p) |
952 | 953 |
953 row->left_fringe_bitmap = left; | 954 row->left_fringe_bitmap = left; |
954 row->right_fringe_bitmap = right; | 955 row->right_fringe_bitmap = right; |
955 row->left_fringe_face_id = left_face_id; | 956 row->left_fringe_face_id = left_face_id; |
956 row->right_fringe_face_id = right_face_id; | 957 row->right_fringe_face_id = right_face_id; |
958 | |
959 if (rn > 0 && row->redraw_fringe_bitmaps_p) | |
960 row[-1].redraw_fringe_bitmaps_p = cur[-1].redraw_fringe_bitmaps_p = 1; | |
957 } | 961 } |
958 | 962 |
959 return redraw_p; | 963 return redraw_p; |
960 } | 964 } |
961 | 965 |
1055 } | 1059 } |
1056 | 1060 |
1057 | 1061 |
1058 /* Free resources used by a user-defined bitmap. */ | 1062 /* Free resources used by a user-defined bitmap. */ |
1059 | 1063 |
1060 int | 1064 void |
1061 destroy_fringe_bitmap (n) | 1065 destroy_fringe_bitmap (n) |
1062 int n; | 1066 int n; |
1063 { | 1067 { |
1064 struct fringe_bitmap **fbp; | 1068 struct fringe_bitmap **fbp; |
1065 | 1069 |