Merge branch 'master' into scratch/pkg

author Gerd Moellmann <gerd.moellmann@gmail.com>

Mon, 4 Sep 2023 09:36:51 +0000 (11:36 +0200)

committer Gerd Moellmann <gerd.moellmann@gmail.com>

Mon, 4 Sep 2023 09:36:51 +0000 (11:36 +0200)
author Gerd Moellmann <gerd.moellmann@gmail.com>
Mon, 4 Sep 2023 09:36:51 +0000 (11:36 +0200)
committer Gerd Moellmann <gerd.moellmann@gmail.com>
Mon, 4 Sep 2023 09:36:51 +0000 (11:36 +0200)
diff --cc lisp/loadup.el
Simple merge
diff --cc lisp/minibuffer.el
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/treesit.c
Simple merge
author	Gerd Moellmann <gerd.moellmann@gmail.com>
	Mon, 4 Sep 2023 09:36:51 +0000 (11:36 +0200)
committer	Gerd Moellmann <gerd.moellmann@gmail.com>
	Mon, 4 Sep 2023 09:36:51 +0000 (11:36 +0200)
		1	2
lisp/loadup.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/minibuffer.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/data.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/treesit.c	patch \|	diff1 \|	diff2 \|	blob \| history