Merge remote-tracking branch 'origin/master' into scratch/pkg

diff --cc lisp/minibuffer.el
Simple merge

diff --cc src/.lldbinit
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/treesit.c
Simple merge