Merge from trunk

1 files changed, 8 insertions, 12 deletions

diff --git a/src/fringe.c b/src/fringe.c
index d42d6467f31..ce75df766ee 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -913,7 +913,12 @@ update_window_fringes (struct window *w, int keep_current_p)
   int bitmap_cache[MAX_BITMAP_CACHE];
   int top_ind_rn, bot_ind_rn;
   int top_ind_min_y, bot_ind_max_y;
-  int top_row_ends_at_zv_p, bot_row_ends_at_zv_p;
+
+  /* top_ind_rn is set to a nonnegative value whenver
+     row->indicate_bob_p is set, so it's OK that top_row_ends_at_zv_p
+     is not initialized here.  Similarly for bot_ind_rn,
+     row->indicate_eob_p and bot_row_ends_at_zv_p.  */
+  int top_row_ends_at_zv_p IF_LINT (= 0), bot_row_ends_at_zv_p IF_LINT (= 0);
 
   if (w->pseudo_window_p)
     return 0;
@@ -949,18 +954,10 @@ update_window_fringes (struct window *w, int keep_current_p)
            y < yb && rn < nrows;
            y += row->height, ++rn)
         {
-          unsigned indicate_bob_p, indicate_top_line_p;
-          unsigned indicate_eob_p, indicate_bottom_line_p;
-
           row = w->desired_matrix->rows + rn;
           if (!row->enabled_p)
             row = w->current_matrix->rows + rn;
 
-          indicate_bob_p = row->indicate_bob_p;
-          indicate_top_line_p = row->indicate_top_line_p;
-          indicate_eob_p = row->indicate_eob_p;
-          indicate_bottom_line_p = row->indicate_bottom_line_p;
-
           row->indicate_bob_p = row->indicate_top_line_p = 0;
           row->indicate_eob_p = row->indicate_bottom_line_p = 0;
 
@@ -1380,7 +1377,7 @@ compute_fringe_widths (struct frame *f, int redraw)
 
 /* Free resources used by a user-defined bitmap.  */
 
-void
+static void
 destroy_fringe_bitmap (int n)
 {
   struct fringe_bitmap **fbp;
@@ -1448,7 +1445,7 @@ static const unsigned char swap_nibble[16] = {
   0x3, 0xb, 0x7, 0xf};          /* 0011 1011 0111 1111 */
 #endif                          /* HAVE_X_WINDOWS */
 
-void
+static void
 init_fringe_bitmap (int which, struct fringe_bitmap *fb, int once_p)
 {
   if (once_p || fb->dynamic)
@@ -1831,4 +1828,3 @@ w32_reset_fringes (void)
 #endif /* HAVE_NTGUI */
 
 #endif /* HAVE_WINDOW_SYSTEM */
-