emacs-29 10918fc9d24: Fix scrolling window when point moves up

[Eli Zaretskii]

branch: emacs-29
commit 10918fc9d249fb829a363a4b73847289b8f2bce9
Author: Shynur <one.last.kiss@outlook.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    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
---
 src/xdisp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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