aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-02 12:11:32 +0000
committerGerd Moellmann2001-01-02 12:11:32 +0000
commita13be20798a4fc282b9955c9684916be88c3196e (patch)
tree8c328e476d3bc8e95b5215c58c698e96e53b3195 /src
parent1a8a9daf94dd28aa40ed80085f7f1eff0d8375bb (diff)
downloademacs-a13be20798a4fc282b9955c9684916be88c3196e.tar.gz
emacs-a13be20798a4fc282b9955c9684916be88c3196e.zip
(pos_visible_p): Take into account that CHARPOS maybe
in or at the start of invisible text.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 638c1c0fdbe..c435a921af5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12001-01-02 Gerd Moellmann <gerd@gnu.org> 12001-01-02 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (pos_visible_p): Take into account that CHARPOS maybe
4 in or at the start of invisible text.
5
3 * dispnew.c (update_window): Don't check_current_matrix_flags. 6 * dispnew.c (update_window): Don't check_current_matrix_flags.
4 7
52001-01-01 Jason Rumney <jasonr@gnu.org> 82001-01-01 Jason Rumney <jasonr@gnu.org>
diff --git a/src/xdisp.c b/src/xdisp.c
index ed98ced48a2..c1b312f1a42 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1012,8 +1012,9 @@ pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
1012 start_display (&it, w, top); 1012 start_display (&it, w, top);
1013 move_it_to (&it, charpos, 0, it.last_visible_y, -1, 1013 move_it_to (&it, charpos, 0, it.last_visible_y, -1,
1014 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); 1014 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
1015 1015
1016 if (IT_CHARPOS (it) == charpos) 1016 /* Note that we may overshoot because of invisible text. */
1017 if (IT_CHARPOS (it) >= charpos)
1017 { 1018 {
1018 int line_height, line_bottom_y; 1019 int line_height, line_bottom_y;
1019 int line_top_y = it.current_y; 1020 int line_top_y = it.current_y;