[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100827: Restore mistakenly reverted
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100827: Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950. |
Date: |
Thu, 15 Jul 2010 19:48:34 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100827
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-15 19:48:34 +0300
message:
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.
modified:
src/ChangeLog
src/fringe.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-14 15:06:33 +0000
+++ b/src/ChangeLog 2010-07-15 16:48:34 +0000
@@ -1,3 +1,8 @@
+2010-07-15 Eli Zaretskii <address@hidden>
+
+ * fringe.c (update_window_fringes): Restore mistakenly reverted
+ code from revno 99854.1.6 merged in revno 99950.
+
2010-07-14 Jan Djärv <address@hidden>
* xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
=== modified file 'src/fringe.c'
--- a/src/fringe.c 2010-07-10 18:52:53 +0000
+++ b/src/fringe.c 2010-07-15 16:48:34 +0000
@@ -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))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100827: Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.,
Eli Zaretskii <=