diff --git a/src/ChangeLog b/src/ChangeLog
index 478786d31fe..7f3285bdae2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-01  Gerd Moellmann  <gerd@gnu.org>
+
+	* window.c (Fwindow_end): Call move_it_past_eol only if
+	ending up on a partially visible line.
+
 2001-03-01  Dave Love  <fx@gnu.org>
 
 	* 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.")
       
       start_display (&it, w, startp);
       move_it_vertically (&it, window_box_height (w));
-      move_it_past_eol (&it);
+      if (it.current_y < it.last_visible_y)
+	move_it_past_eol (&it);
       value = make_number (IT_CHARPOS (it));
       
       if (old_buffer)