aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-01 19:33:02 +0000
committerGerd Moellmann2001-03-01 19:33:02 +0000
commitc3c45f65ba3d99aa53796cbfe47de73bcb7b949a (patch)
tree0d8f22b575dbac7f93ae5504c80fdf401b280498
parent028d739af168b1c9737a279a37743c9beb42dbcd (diff)
downloademacs-c3c45f65ba3d99aa53796cbfe47de73bcb7b949a.tar.gz
emacs-c3c45f65ba3d99aa53796cbfe47de73bcb7b949a.zip
(Fwindow_end): Call move_it_past_eol only if
ending up on a partially visible line.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 478786d31fe..7f3285bdae2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-03-01 Gerd Moellmann <gerd@gnu.org>
2
3 * window.c (Fwindow_end): Call move_it_past_eol only if
4 ending up on a partially visible line.
5
12001-03-01 Dave Love <fx@gnu.org> 62001-03-01 Dave Love <fx@gnu.org>
2 7
3 * ccl.c (Fccl_execute): Doc fix. 8 * ccl.c (Fccl_execute): Doc fix.
diff --git a/src/window.c b/src/window.c
index 71e490724b6..b02cc6b7969 100644
--- a/src/window.c
+++ b/src/window.c
@@ -930,7 +930,8 @@ if it isn't already recorded.")
930 930
931 start_display (&it, w, startp); 931 start_display (&it, w, startp);
932 move_it_vertically (&it, window_box_height (w)); 932 move_it_vertically (&it, window_box_height (w));
933 move_it_past_eol (&it); 933 if (it.current_y < it.last_visible_y)
934 move_it_past_eol (&it);
934 value = make_number (IT_CHARPOS (it)); 935 value = make_number (IT_CHARPOS (it));
935 936
936 if (old_buffer) 937 if (old_buffer)