2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3dc45c96ef5..f2678e68ef5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-24  Kim F. Storm  <storm@cua.dk>
 
+        * window.c (window_scroll_pixel_based): Fix scrolling in the wrong
+        direction if window height was smaller than next-screen-context-lines.
+        Now always scroll at least one line in the requested direction.
+        Ensure that we actually do scroll backwards when requested to do so.
+
         * xdisp.c (redisplay_window): Only try to make cursor line fully
         visible once (to avoid redisplay loop).
 
diff --git a/src/xdisp.c b/src/xdisp.c
index f1877c494cb..afcc4844ab2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12231,6 +12231,8 @@ redisplay_window (window, just_this_one_p)
       /* If centering point failed to make the whole line visible,
          put point at the top instead.  That has to make the whole line
          visible, if it can be done.  */
+      if (centering_position == 0)
+        goto done;
       clear_glyph_matrix (w->desired_matrix);
       centering_position = 0;
       goto point_at_top;