aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-05-08 12:29:49 +0300
committerEli Zaretskii2010-05-08 12:29:49 +0300
commit96d79611095cd8e906676d871a033549f0ec98b4 (patch)
tree8207e3c95c2e3f405ceebb0a958291f2d93bc86b /src
parenta4f64981f2a7de83b08dc9ed44959733ad26132d (diff)
downloademacs-96d79611095cd8e906676d871a033549f0ec98b4.tar.gz
emacs-96d79611095cd8e906676d871a033549f0ec98b4.zip
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 @@
12010-05-08 Eli Zaretskii <eliz@gnu.org>
2
3 * fringe.c (update_window_fringes): Set up truncation bitmaps for
4 R2L lines.
5
12010-05-08 Glenn Morris <rgm@gnu.org> 62010-05-08 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. 8 * 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)
1082 left = row->left_user_fringe_bitmap; 1082 left = row->left_user_fringe_bitmap;
1083 left_face_id = row->left_user_fringe_face_id; 1083 left_face_id = row->left_user_fringe_face_id;
1084 } 1084 }
1085 else if (row->truncated_on_left_p) 1085 else if ((!row->reversed_p && row->truncated_on_left_p)
1086 || (row->reversed_p && row->truncated_on_right_p))
1086 left = LEFT_FRINGE(0, Qtruncation, 0); 1087 left = LEFT_FRINGE(0, Qtruncation, 0);
1087 else if (row->indicate_bob_p && EQ (boundary_top, Qleft)) 1088 else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
1088 left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft)) 1089 left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
@@ -1110,7 +1111,8 @@ update_window_fringes (w, keep_current_p)
1110 right = row->right_user_fringe_bitmap; 1111 right = row->right_user_fringe_bitmap;
1111 right_face_id = row->right_user_fringe_face_id; 1112 right_face_id = row->right_user_fringe_face_id;
1112 } 1113 }
1113 else if (row->truncated_on_right_p) 1114 else if ((!row->reversed_p && row->truncated_on_right_p)
1115 || (row->reversed_p && row->truncated_on_left_p))
1114 right = RIGHT_FRINGE (0, Qtruncation, 0); 1116 right = RIGHT_FRINGE (0, Qtruncation, 0);
1115 else if (row->indicate_bob_p && EQ (boundary_top, Qright)) 1117 else if (row->indicate_bob_p && EQ (boundary_top, Qright))
1116 right = ((row->indicate_eob_p && EQ (boundary_bot, Qright)) 1118 right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))