[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fringe.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/fringe.c |
Date: |
Sun, 21 Aug 2005 16:57:42 -0400 |
Index: emacs/src/fringe.c
diff -c emacs/src/fringe.c:1.29 emacs/src/fringe.c:1.30
*** emacs/src/fringe.c:1.29 Sun Aug 7 12:33:17 2005
--- emacs/src/fringe.c Sun Aug 21 20:57:42 2005
***************
*** 777,789 ****
/* Recalculate the bitmaps to show in the fringes of window W.
! If FORCE_P is 0, only mark rows with modified bitmaps for update in
! redraw_fringe_bitmaps_p; else mark all rows for update. */
int
! update_window_fringes (w, force_p)
struct window *w;
! int force_p;
{
struct glyph_row *row, *cur = 0;
int yb = window_text_bottom_y (w);
--- 777,790 ----
/* Recalculate the bitmaps to show in the fringes of window W.
! Only mark rows with modified bitmaps for update in redraw_fringe_bitmaps_p.
!
! If KEEP_CURRENT_P is 0, update current_matrix too. */
int
! update_window_fringes (w, keep_current_p)
struct window *w;
! int keep_current_p;
{
struct glyph_row *row, *cur = 0;
int yb = window_text_bottom_y (w);
***************
*** 943,950 ****
else
right = NO_FRINGE_BITMAP;
! if (force_p
! || row->y != cur->y
|| row->visible_height != cur->visible_height
|| row->ends_at_zv_p != cur->ends_at_zv_p
|| left != cur->left_fringe_bitmap
--- 944,950 ----
else
right = NO_FRINGE_BITMAP;
! if (row->y != cur->y
|| row->visible_height != cur->visible_height
|| row->ends_at_zv_p != cur->ends_at_zv_p
|| left != cur->left_fringe_bitmap
***************
*** 953,963 ****
|| right_face_id != cur->right_fringe_face_id
|| cur->redraw_fringe_bitmaps_p)
{
! redraw_p = row->redraw_fringe_bitmaps_p =
cur->redraw_fringe_bitmaps_p = 1;
! cur->left_fringe_bitmap = left;
! cur->right_fringe_bitmap = right;
! cur->left_fringe_face_id = left_face_id;
! cur->right_fringe_face_id = right_face_id;
}
if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
--- 953,967 ----
|| right_face_id != cur->right_fringe_face_id
|| cur->redraw_fringe_bitmaps_p)
{
! redraw_p = row->redraw_fringe_bitmaps_p = 1;
! if (!keep_current_p)
! {
! cur->redraw_fringe_bitmaps_p = 1;
! cur->left_fringe_bitmap = left;
! cur->right_fringe_bitmap = right;
! cur->left_fringe_face_id = left_face_id;
! cur->right_fringe_face_id = right_face_id;
! }
}
if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
***************
*** 975,981 ****
row[-1].redraw_fringe_bitmaps_p = cur[-1].redraw_fringe_bitmaps_p = 1;
}
! return redraw_p;
}
--- 979,985 ----
row[-1].redraw_fringe_bitmaps_p = cur[-1].redraw_fringe_bitmaps_p = 1;
}
! return redraw_p && !keep_current_p;
}