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

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

diff --cc src/Makefile.in
index 0ccda6328469b1a1a63eacfd0c6989775bfc9847,da11e130b2acb966e168d0e3c540df6b968a61d6..5d6fe6ebfdeea772e0a1fadcd6c6cc58338d99cb
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -441,8 -444,7 +444,8 @@@ base_obj = dispnew.o frame.o scroll.o x
        doprnt.o intervals.o textprop.o composite.o xml.o lcms.o $(NOTIFY_OBJ) \
        $(XWIDGETS_OBJ)                                                        \
        profiler.o decompress.o                                                \
-       thread.o systhread.o sqlite.o                                          \
 +      pkg.o                                                                  \
+       thread.o systhread.o sqlite.o  treesit.o                               \
        itree.o                                                                \
        $(if $(HYBRID_MALLOC),sheap.o)                                         \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)        \

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/lread.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/xfaces.c
Simple merge