Merge branch 'master' into scratch/correct-warning-pos

Merge branch:
commit d29291d665e808307126bf52c3e748fef78f0f9c (HEAD -> master,
origin/master, origin/HEAD)
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Fri Jan 14 12:26:30 2022 -0500

    (macroexp--expand-all): Fix bug#53227 and bug#46636

1 files changed, 6 insertions, 10 deletions

diff --git a/src/data.c b/src/data.c
index e999cee242e..7422348e392 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2180,7 +2180,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
 
   /* Make sure this buffer has its own value of symbol.  */
   XSETSYMBOL (variable, sym);   /* Update in case of aliasing.  */
-  tem = Fassq (variable, BVAR (current_buffer, local_var_alist));
+  tem = assq_no_quit (variable, BVAR (current_buffer, local_var_alist));
   if (NILP (tem))
     {
       if (let_shadows_buffer_binding_p (sym))
@@ -2260,7 +2260,7 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
 
   /* Get rid of this buffer's alist element, if any.  */
   XSETSYMBOL (variable, sym);   /* Propagate variable indirection.  */
-  tem = Fassq (variable, BVAR (current_buffer, local_var_alist));
+  tem = assq_no_quit (variable, BVAR (current_buffer, local_var_alist));
   if (!NILP (tem))
     bset_local_var_alist
       (current_buffer,
@@ -2301,7 +2301,7 @@ Also see `buffer-local-boundp'.*/)
     case SYMBOL_PLAINVAL: return Qnil;
     case SYMBOL_LOCALIZED:
       {
-        Lisp_Object tail, elt, tmp;
+        Lisp_Object tmp;
         struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
         XSETBUFFER (tmp, buf);
         XSETSYMBOL (variable, sym); /* Update in case of aliasing.  */
@@ -2309,13 +2309,9 @@ Also see `buffer-local-boundp'.*/)
         if (EQ (blv->where, tmp)) /* The binding is already loaded.  */
           return blv_found (blv) ? Qt : Qnil;
         else
-          for (tail = BVAR (buf, local_var_alist); CONSP (tail); tail = XCDR (tail))
-            {
-              elt = XCAR (tail);
-              if (EQ (variable, XCAR (elt)))
-                return Qt;
-            }
-        return Qnil;
+          return NILP (assq_no_quit (variable, BVAR (buf, local_var_alist)))
+            ? Qnil
+            : Qt;
       }
     case SYMBOL_FORWARDED:
       {