aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-07-15 19:48:34 +0300
committerEli Zaretskii2010-07-15 19:48:34 +0300
commitc4affd2cb4ddec78e76853e8518400d8b2a23ddb (patch)
tree1360d4d479214df0aeb2b11f5e1781f76594d6f7
parent7473fff9e586df067e04f793941c5f0c2eaf1179 (diff)
downloademacs-c4affd2cb4ddec78e76853e8518400d8b2a23ddb.tar.gz
emacs-c4affd2cb4ddec78e76853e8518400d8b2a23ddb.zip
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.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fringe.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5119a048c2f..4f6990ba2c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-07-15 Eli Zaretskii <eliz@gnu.org>
2
3 * fringe.c (update_window_fringes): Restore mistakenly reverted
4 code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in 2010-04-20T13:31:28Z!eliz@gnu.org.
5
12010-07-14 Jan Djärv <jan.h.d@swipnet.se> 62010-07-14 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype. 8 * 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)
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);
@@ -1240,7 +1241,8 @@ update_window_fringes (struct window *w, int keep_current_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 {