Mercurial > emacs
changeset 109439:9ad1e76fc718
Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
fringe.c (update_window_fringes): For R2L rows, swap the bitmaps
of continuation indicators on the fringes.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 15 Jul 2010 19:48:34 +0300 |
| parents | 5ff030a9ca0a |
| children | f8f118e78387 |
| files | src/ChangeLog src/fringe.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 15 10:36:27 2010 -0400 +++ b/src/ChangeLog Thu Jul 15 19:48:34 2010 +0300 @@ -1,3 +1,8 @@ +2010-07-15 Eli Zaretskii <eliz@gnu.org> + + * fringe.c (update_window_fringes): Restore mistakenly reverted + code from revno 99854.1.6 merged in revno 99950. + 2010-07-14 Jan Djärv <jan.h.d@swipnet.se> * xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
--- a/src/fringe.c Thu Jul 15 10:36:27 2010 -0400 +++ b/src/fringe.c Thu Jul 15 19:48:34 2010 +0300 @@ -1196,7 +1196,8 @@ if (bot_ind_max_y >= 0) left_offset = bot_ind_max_y - (row->y + row->visible_height); } - else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) + else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)) + || (row->reversed_p && row->continued_p)) left = LEFT_FRINGE (4, Qcontinuation, 0); else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) left = LEFT_FRINGE (5, Qempty_line, 0); @@ -1240,7 +1241,8 @@ if (bot_ind_max_y >= 0) right_offset = bot_ind_max_y - (row->y + row->visible_height); } - else if (row->continued_p) + else if ((!row->reversed_p && row->continued_p) + || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))) right = RIGHT_FRINGE (4, Qcontinuation, 0); else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) {