aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-05-15 19:17:42 +0300
committerEli Zaretskii2012-05-15 19:17:42 +0300
commitccbf309ce0aa34ef55405945ed29db41250aa34e (patch)
treebb413130f40ae9362ab2a03d85f228d1cadce689 /src
parent27d1f87a35539846cc11238f1feaa6b7e6138775 (diff)
downloademacs-ccbf309ce0aa34ef55405945ed29db41250aa34e.tar.gz
emacs-ccbf309ce0aa34ef55405945ed29db41250aa34e.zip
Fix the changes in 2012-04-22T13:58:00Z!cyd@gnu.org for bug #11464.
src/xdisp.c (pos_visible_p): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2f3643f4f80..2a7f8e2958f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-05-15 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (pos_visible_p): Fix last change. (Bug#11464)
4
12012-05-13 Eli Zaretskii <eliz@gnu.org> 52012-05-13 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xdisp.c (handle_stop): Don't call get_overlay_strings_1 if we 7 * xdisp.c (handle_stop): Don't call get_overlay_strings_1 if we
diff --git a/src/xdisp.c b/src/xdisp.c
index a2c4589766d..e8253c714e3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1313,7 +1313,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y,
1313 visible_p = bottom_y > window_top_y; 1313 visible_p = bottom_y > window_top_y;
1314 else if (top_y < it.last_visible_y) 1314 else if (top_y < it.last_visible_y)
1315 visible_p = 1; 1315 visible_p = 1;
1316 if (bottom_y >= it.last_visible_y 1316 if (bottom_y <= it.last_visible_y
1317 && it.bidi_p && it.bidi_it.scan_dir == -1 1317 && it.bidi_p && it.bidi_it.scan_dir == -1
1318 && IT_CHARPOS (it) < charpos) 1318 && IT_CHARPOS (it) < charpos)
1319 { 1319 {