Merge remote-tracking branch 'origin/master' into feature/android

3 files changed, 13 insertions, 3 deletions

diff --git a/src/comp.c b/src/comp.c
index 5cbe441dd7f..9ff3efedbdd 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5910,6 +5910,14 @@ For internal use.  */);
   Vcomp_loaded_comp_units_h =
     CALLN (Fmake_hash_table, QCweakness, Qvalue, QCtest, Qequal);
 
+  DEFVAR_LISP ("comp-subr-arities-h", Vcomp_subr_arities_h,
+    doc: /* Hash table recording the arity of Lisp primitives.
+This is in case they are redefined so the compiler still knows how to
+compile calls to them.
+subr-name -> arity
+For internal use.  */);
+  Vcomp_subr_arities_h = CALLN (Fmake_hash_table, QCtest, Qequal);
+
   Fprovide (intern_c_string ("native-compile"), Qnil);
 #endif /* #ifdef HAVE_NATIVE_COMP */
 
diff --git a/src/eval.c b/src/eval.c
index eb40c953f96..1a4d3ad0307 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3400,7 +3400,7 @@ DEFUN ("fetch-bytecode", Ffetch_bytecode, Sfetch_bytecode,
   return object;
 }
 
-/* Return true if SYMBOL currently has a let-binding
+/* Return true if SYMBOL's default currently has a let-binding
    which was made in the buffer that is now current.  */
 
 bool
@@ -3415,6 +3415,7 @@ let_shadows_buffer_binding_p (struct Lisp_Symbol *symbol)
         struct Lisp_Symbol *let_bound_symbol = XSYMBOL (specpdl_symbol (p));
         eassert (let_bound_symbol->u.s.redirect != SYMBOL_VARALIAS);
         if (symbol == let_bound_symbol
+            && p->kind != SPECPDL_LET_LOCAL /* bug#62419 */
             && EQ (specpdl_where (p), buf))
           return 1;
       }
diff --git a/src/xdisp.c b/src/xdisp.c
index 7cde3d30885..046d1f78452 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18593,8 +18593,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