Fix point movement under 'scroll-conservatively'

* src/xdisp.c (redisplay_window): Correct a typo in computing the
effective number of text lines in a window.  (Bug#22637)

diff --git a/src/xdisp.c b/src/xdisp.c
index 840699d00fba60638cd67ffdec4b5b688607d753..fed58799eaae0ede3b29b49b23d926b0a35afd75 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16920,7 +16920,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
       if (scroll_conservatively > SCROLL_LIMIT)
        {
          int window_total_lines
-           = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) * frame_line_height;
+           = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) / frame_line_height;
          int margin =
            scroll_margin > 0
            ? min (scroll_margin, window_total_lines / 4)