From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 14 Feb 2016 19:20:48 +0000 (+0200)
Subject: Fix point movement under 'scroll-conservatively'
X-Git-Tag: emacs-25.0.92~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84829495b5746417f5eaf9be693fb35f0509697a;p=emacs.git

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 840699d00fb..fed58799eaa 100644
--- 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)