summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-05-08 12:29:49 +0300
committerEli Zaretskii <eliz@gnu.org>2010-05-08 12:29:49 +0300
commit96d79611095cd8e906676d871a033549f0ec98b4 (patch)
tree8207e3c95c2e3f405ceebb0a958291f2d93bc86b /src
parenta4f64981f2a7de83b08dc9ed44959733ad26132d (diff)
downloademacs-96d79611095cd8e906676d871a033549f0ec98b4.tar.gz
Fix fringe truncation bitmaps in R2L lines.
fringe.c (update_window_fringes): Set up truncation bitmaps for R2L lines.
Diffstat (limited to 'src')
-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 296c468f2ee..1ec145b72fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-08 Eli Zaretskii <eliz@gnu.org>
+
+ * fringe.c (update_window_fringes): Set up truncation bitmaps for
+ R2L lines.
+
2010-05-08 Glenn Morris <rgm@gnu.org>
* Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
diff --git a/src/fringe.c b/src/fringe.c
index cfb944d58d1..6dcacbbcd3f 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1082,7 +1082,8 @@ update_window_fringes (w, keep_current_p)
left = row->left_user_fringe_bitmap;
left_face_id = row->left_user_fringe_face_id;
}
- else if (row->truncated_on_left_p)
+ else if ((!row->reversed_p && row->truncated_on_left_p)
+ || (row->reversed_p && row->truncated_on_right_p))
left = LEFT_FRINGE(0, Qtruncation, 0);
else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
@@ -1110,7 +1111,8 @@ update_window_fringes (w, keep_current_p)
right = row->right_user_fringe_bitmap;
right_face_id = row->right_user_fringe_face_id;
}
- else if (row->truncated_on_right_p)
+ else if ((!row->reversed_p && row->truncated_on_right_p)
+ || (row->reversed_p && row->truncated_on_left_p))
right = RIGHT_FRINGE (0, Qtruncation, 0);
else if (row->indicate_bob_p && EQ (boundary_top, Qright))
right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))