aboutsummaryrefslogtreecommitdiffstats
path: root/src/fringe.c
diff options
context:
space:
mode:
authorKaroly Lorentey2004-11-13 18:34:40 +0000
committerKaroly Lorentey2004-11-13 18:34:40 +0000
commite417405015c93c81641f5c4a33ec898b5c353772 (patch)
tree017a980c35c8a71c372304418d151e3826f88636 /src/fringe.c
parentf590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (diff)
parent68d1b30d251b4771f739d20f507cd9523ae3919b (diff)
downloademacs-e417405015c93c81641f5c4a33ec898b5c353772.tar.gz
emacs-e417405015c93c81641f5c4a33ec898b5c353772.zip
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
Diffstat (limited to 'src/fringe.c')
-rw-r--r--src/fringe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/fringe.c b/src/fringe.c
index e66fa4adecc..03abffab5c8 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -931,6 +931,7 @@ update_window_fringes (w, force_p)
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
@@ -954,6 +955,9 @@ update_window_fringes (w, force_p)
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;
@@ -1057,7 +1061,7 @@ compute_fringe_widths (f, redraw)
1057 1061
1058/* Free resources used by a user-defined bitmap. */ 1062/* Free resources used by a user-defined bitmap. */
1059 1063
1060int 1064void
1061destroy_fringe_bitmap (n) 1065destroy_fringe_bitmap (n)
1062 int n; 1066 int n;
1063{ 1067{