(Frecenter): When changing the window start, set the

window's window_end_valid to nil.
(Fwindow_end): Fix window-end computation when UPDATE is non-nil.

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c167e3721fe..b47b5c69512 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2001-01-03  Gerd Moellmann  <gerd@gnu.org>
 
+        * window.c (Frecenter): When changing the window start, set the
+        window's window_end_valid to nil.
+        (Fwindow_end): Fix window-end computation when UPDATE is non-nil.
+
+        * dispextern.h (move_it_past_eol): Add prototype.
+
+        * xdisp.c (move_it_past_eol): New function.
+
         * window.c (Fwindow_end): Doc fix.
 
 2001-01-03  Dave Love  <fx@gnu.org>
diff --git a/src/window.c b/src/window.c
index ac12c1ee804..5d779026bad 100644
--- a/src/window.c
+++ b/src/window.c
@@ -908,6 +908,7 @@ if it isn't already recorded.")
          cope with variable-height lines.  */
       start_display (&it, w, startp);
       move_it_vertically (&it, window_box_height (w));
+      move_it_past_eol (&it);
       value = make_number (IT_CHARPOS (it));
     }
   else
@@ -4555,6 +4556,7 @@ and redisplay normally--don't erase and redraw the frame.")
 
   /* Set the new window start.  */
   set_marker_both (w->start, w->buffer, charpos, bytepos);
+  w->window_end_valid = Qnil;
   w->force_start = Qt;
   if (bytepos == BEGV_BYTE || FETCH_BYTE (bytepos - 1) == '\n')
     w->start_at_line_beg = Qt;