[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fringe.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/fringe.c [emacs-unicode-2] |
Date: |
Wed, 08 Dec 2004 00:48:33 -0500 |
Index: emacs/src/fringe.c
diff -c emacs/src/fringe.c:1.10.2.6 emacs/src/fringe.c:1.10.2.7
*** emacs/src/fringe.c:1.10.2.6 Fri Nov 19 06:54:57 2004
--- emacs/src/fringe.c Wed Dec 8 05:02:18 2004
***************
*** 809,820 ****
arrow_bot = XCDR (pos);
}
else
! ind = Qnil;
}
if (!NILP (ind))
{
! int do_eob = 1, do_bob = 1;
for (y = 0, rn = 0;
y < yb && rn < nrows;
--- 809,821 ----
arrow_bot = XCDR (pos);
}
else
! /* Anything else means boundary on left and no arrows. */
! boundary_top = boundary_bot = Qleft;
}
if (!NILP (ind))
{
! int done_top = 0, done_bot = 0;
for (y = 0, rn = 0;
y < yb && rn < nrows;
***************
*** 835,853 ****
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
***************
*** 883,895 ****
left = row->left_user_fringe_bitmap;
left_face_id = row->left_user_fringe_face_id;
}
else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
? LEFT_BRACKET_BITMAP : TOP_LEFT_ANGLE_BITMAP);
else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
left = BOTTOM_LEFT_ANGLE_BITMAP;
- else if (row->truncated_on_left_p)
- left = LEFT_TRUNCATION_BITMAP;
else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
left = CONTINUATION_LINE_BITMAP;
else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
--- 890,902 ----
left = row->left_user_fringe_bitmap;
left_face_id = row->left_user_fringe_face_id;
}
+ else if (row->truncated_on_left_p)
+ left = LEFT_TRUNCATION_BITMAP;
else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
? LEFT_BRACKET_BITMAP : TOP_LEFT_ANGLE_BITMAP);
else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
left = BOTTOM_LEFT_ANGLE_BITMAP;
else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
left = CONTINUATION_LINE_BITMAP;
else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
***************
*** 909,921 ****
right = row->right_user_fringe_bitmap;
right_face_id = row->right_user_fringe_face_id;
}
else if (row->indicate_bob_p && EQ (boundary_top, Qright))
right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
? RIGHT_BRACKET_BITMAP : TOP_RIGHT_ANGLE_BITMAP);
else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
right = BOTTOM_RIGHT_ANGLE_BITMAP;
- else if (row->truncated_on_right_p)
- right = RIGHT_TRUNCATION_BITMAP;
else if (row->continued_p)
right = CONTINUED_LINE_BITMAP;
else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
--- 916,928 ----
right = row->right_user_fringe_bitmap;
right_face_id = row->right_user_fringe_face_id;
}
+ else if (row->truncated_on_right_p)
+ right = RIGHT_TRUNCATION_BITMAP;
else if (row->indicate_bob_p && EQ (boundary_top, Qright))
right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
? RIGHT_BRACKET_BITMAP : TOP_RIGHT_ANGLE_BITMAP);
else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
right = BOTTOM_RIGHT_ANGLE_BITMAP;
else if (row->continued_p)
right = CONTINUED_LINE_BITMAP;
else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
***************
*** 1346,1352 ****
if (!NILP (face))
{
! face_id = lookup_named_face (SELECTED_FRAME (), face);
if (face_id < 0)
error ("No such face");
}
--- 1353,1359 ----
if (!NILP (face))
{
! face_id = lookup_named_face (SELECTED_FRAME (), face, 1);
if (face_id < 0)
error ("No such face");
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/fringe.c [emacs-unicode-2],
Miles Bader <=