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

diff --cc lisp/files.el
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/treesit.c
Simple merge