1 files changed, 2 insertions, 1 deletions

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)