Mercurial > emacs
comparison src/fringe.c @ 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 | 60516122d066 |
| children | d12162869c07 |
comparison
equal
deleted
inserted
replaced
| 109438:5ff030a9ca0a | 109439:9ad1e76fc718 |
|---|---|
| 1194 { | 1194 { |
| 1195 left = LEFT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p); | 1195 left = LEFT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p); |
| 1196 if (bot_ind_max_y >= 0) | 1196 if (bot_ind_max_y >= 0) |
| 1197 left_offset = bot_ind_max_y - (row->y + row->visible_height); | 1197 left_offset = bot_ind_max_y - (row->y + row->visible_height); |
| 1198 } | 1198 } |
| 1199 else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) | 1199 else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)) |
| 1200 || (row->reversed_p && row->continued_p)) | |
| 1200 left = LEFT_FRINGE (4, Qcontinuation, 0); | 1201 left = LEFT_FRINGE (4, Qcontinuation, 0); |
| 1201 else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) | 1202 else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) |
| 1202 left = LEFT_FRINGE (5, Qempty_line, 0); | 1203 left = LEFT_FRINGE (5, Qempty_line, 0); |
| 1203 else if (row->indicate_top_line_p && EQ (arrow_top, Qleft)) | 1204 else if (row->indicate_top_line_p && EQ (arrow_top, Qleft)) |
| 1204 { | 1205 { |
| 1238 { | 1239 { |
| 1239 right = RIGHT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p); | 1240 right = RIGHT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p); |
| 1240 if (bot_ind_max_y >= 0) | 1241 if (bot_ind_max_y >= 0) |
| 1241 right_offset = bot_ind_max_y - (row->y + row->visible_height); | 1242 right_offset = bot_ind_max_y - (row->y + row->visible_height); |
| 1242 } | 1243 } |
| 1243 else if (row->continued_p) | 1244 else if ((!row->reversed_p && row->continued_p) |
| 1245 || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))) | |
| 1244 right = RIGHT_FRINGE (4, Qcontinuation, 0); | 1246 right = RIGHT_FRINGE (4, Qcontinuation, 0); |
| 1245 else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) | 1247 else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) |
| 1246 { | 1248 { |
| 1247 right = RIGHT_FRINGE (6, Qup, 0); | 1249 right = RIGHT_FRINGE (6, Qup, 0); |
| 1248 if (top_ind_min_y >= 0) | 1250 if (top_ind_min_y >= 0) |