Merge from origin/emacs-29

author Stefan Kangas <stefankangas@gmail.com>

Wed, 21 Dec 2022 05:30:10 +0000 (06:30 +0100)

committer Stefan Kangas <stefankangas@gmail.com>

Wed, 21 Dec 2022 05:30:10 +0000 (06:30 +0100)
author Stefan Kangas <stefankangas@gmail.com>
Wed, 21 Dec 2022 05:30:10 +0000 (06:30 +0100)
committer Stefan Kangas <stefankangas@gmail.com>
Wed, 21 Dec 2022 05:30:10 +0000 (06:30 +0100)
diff --cc lisp/progmodes/js.el
Simple merge
diff --cc lisp/treesit.el
Simple merge
author	Stefan Kangas <stefankangas@gmail.com>
	Wed, 21 Dec 2022 05:30:10 +0000 (06:30 +0100)
committer	Stefan Kangas <stefankangas@gmail.com>
	Wed, 21 Dec 2022 05:30:10 +0000 (06:30 +0100)
		1	2
lisp/progmodes/js.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/treesit.el	patch \|	diff1 \|	diff2 \|	blob \| history