From: Shynur <one.last.kiss@outlook.com>
Date: Wed, 29 Mar 2023 17:29:17 +0000 (+0800)
Subject: Fix scrolling window when point moves up
X-Git-Tag: emacs-29.0.90~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10918fc9d24;p=emacs.git

Fix scrolling window when point moves up

This fixes the case when both 'scroll-conservatively' and
'scroll-step' are customized to non-default values.
* src/xdisp.c (try_scrolling): Fix precedence between
'scroll-step' and 'scroll-conservatively' when scrolling with
'previous-line'.  (Bug#62530)

Copyright-paperwork-exempt: yes
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 0b190529404..8e265fb5a49 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18546,8 +18546,9 @@ try_scrolling (Lisp_Object window, bool just_this_one_p,
 	  start_display (&it, w, startp);
 
 	  if (arg_scroll_conservatively)
-	    amount_to_scroll = max (dy, frame_line_height
-				    * max (scroll_step, temp_scroll_step));
+	    amount_to_scroll
+	      = min (max (dy, frame_line_height),
+		     frame_line_height * arg_scroll_conservatively);
 	  else if (scroll_step || temp_scroll_step)
 	    amount_to_scroll = scroll_max;
 	  else