From: Gerd Möllmann <gerd@gnu.org>
Date: Tue, 22 Nov 2022 08:19:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into feature/pkg
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e148d8c49e4e554f536fb022962247eb5397e9b8;p=emacs.git

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

e148d8c49e4e554f536fb022962247eb5397e9b8
diff --cc src/Makefile.in
index 0ccda632846,da11e130b2a..5d6fe6ebfde
--- a/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)        \