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

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/macroexp.el
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/treesit.c
Simple merge

diff --cc src/xfaces.c
Simple merge