From: Eli Zaretskii Date: Thu, 15 Jul 2010 16:48:34 +0000 (+0300) Subject: Restore mistakenly reverted code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in... X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~44 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4affd2cb4ddec78e76853e8518400d8b2a23ddb;p=emacs.git Restore mistakenly reverted code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in 2010-04-20T13:31:28Z!eliz@gnu.org. fringe.c (update_window_fringes): For R2L rows, swap the bitmaps of continuation indicators on the fringes. --- diff --git a/src/ChangeLog b/src/ChangeLog index 5119a048c2f..4f6990ba2c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-15 Eli Zaretskii + + * fringe.c (update_window_fringes): Restore mistakenly reverted + code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in 2010-04-20T13:31:28Z!eliz@gnu.org. + 2010-07-14 Jan Djärv * xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype. diff --git a/src/fringe.c b/src/fringe.c index 399779009dc..cab3c6feabc 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1196,7 +1196,8 @@ update_window_fringes (struct window *w, int keep_current_p) 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 @@ update_window_fringes (struct window *w, int keep_current_p) 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)) {