Merge master into feature/improved-locked-narrowing.

author Gregory Heytings <gregory@heytings.org>

Tue, 23 Aug 2022 15:50:41 +0000 (17:50 +0200)

committer Gregory Heytings <gregory@heytings.org>

Tue, 23 Aug 2022 15:50:41 +0000 (17:50 +0200)
author Gregory Heytings <gregory@heytings.org>
Tue, 23 Aug 2022 15:50:41 +0000 (17:50 +0200)
committer Gregory Heytings <gregory@heytings.org>
Tue, 23 Aug 2022 15:50:41 +0000 (17:50 +0200)
diff --cc lisp/subr.el
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Gregory Heytings <gregory@heytings.org>
	Tue, 23 Aug 2022 15:50:41 +0000 (17:50 +0200)
committer	Gregory Heytings <gregory@heytings.org>
	Tue, 23 Aug 2022 15:50:41 +0000 (17:50 +0200)
		1	2
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/editfns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history