[Emacs-diffs] Changes to emacs/src/fringe.c

[Kim F . Storm]

Index: emacs/src/fringe.c
diff -c emacs/src/fringe.c:1.21 emacs/src/fringe.c:1.22
*** emacs/src/fringe.c:1.21     Mon Nov 22 14:26:23 2004
--- emacs/src/fringe.c  Mon Nov 22 23:26:36 2004
***************
*** 815,821 ****
  
    if (!NILP (ind))
      {
!       int do_eob = 1, do_bob = 1;
  
        for (y = 0, rn = 0;
           y < yb && rn < nrows;
--- 815,821 ----
  
    if (!NILP (ind))
      {
!       int done_top = 0, done_bot = 0;
  
        for (y = 0, rn = 0;
           y < yb && rn < nrows;
***************
*** 836,854 ****
          row->indicate_bob_p = row->indicate_top_line_p = 0;
          row->indicate_eob_p = row->indicate_bottom_line_p = 0;
  
!         if (!NILP (boundary_top)
!             && MATRIX_ROW_START_CHARPOS (row) <= BUF_BEGV (XBUFFER 
(w->buffer)))
!           row->indicate_bob_p = do_bob, do_bob = 0;
!         else if (!NILP (arrow_top)
!                  && (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0) == rn)
!           row->indicate_top_line_p = 1;
! 
!         if (!NILP (boundary_bot)
!             && MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer)))
!           row->indicate_eob_p = do_eob, do_eob = 0;
!         else if (!NILP (arrow_bot)
!                  && y + row->height >= yb)
!           row->indicate_bottom_line_p = 1;
  
          if (indicate_bob_p != row->indicate_bob_p
              || indicate_top_line_p != row->indicate_top_line_p
--- 836,860 ----
          row->indicate_bob_p = row->indicate_top_line_p = 0;
          row->indicate_eob_p = row->indicate_bottom_line_p = 0;
  
!         if (!row->mode_line_p)
!           {
!             if (!done_top)
!               {
!                 if (MATRIX_ROW_START_CHARPOS (row) <= BUF_BEGV (XBUFFER 
(w->buffer)))
!                   row->indicate_bob_p = !NILP (boundary_top);
!                 else
!                   row->indicate_top_line_p = !NILP (arrow_top);
!                 done_top = 1;
!               }
! 
!             if (!done_bot)
!               {
!                 if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER 
(w->buffer)))
!                   row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1;
!                 else if (y + row->height >= yb)
!                   row->indicate_bottom_line_p = !NILP (arrow_bot), done_bot = 
1;
!               }
!           }
  
          if (indicate_bob_p != row->indicate_bob_p
              || indicate_top_line_p != row->indicate_top_line_p
***************
*** 1347,1353 ****
  
    if (!NILP (face))
      {
!       face_id = lookup_named_face (SELECTED_FRAME (), face, 'A');
        if (face_id < 0)
        error ("No such face");
      }
--- 1353,1359 ----
  
    if (!NILP (face))
      {
!       face_id = lookup_named_face (SELECTED_FRAME (), face, 'A', 1);
        if (face_id < 0)
        error ("No such face");
      }