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
This commit is contained in:
Shynur 2023-03-30 01:29:17 +08:00 committed by Eli Zaretskii
parent 9b32bc134c
commit 10918fc9d2

View file

@ -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