Merge remote-tracking branch 'origin/scratch/noverlay'

author Stefan Monnier <monnier@iro.umontreal.ca>

Thu, 17 Nov 2022 23:48:38 +0000 (18:48 -0500)

committer Stefan Monnier <monnier@iro.umontreal.ca>

Thu, 17 Nov 2022 23:48:38 +0000 (18:48 -0500)
author Stefan Monnier <monnier@iro.umontreal.ca>
Thu, 17 Nov 2022 23:48:38 +0000 (18:48 -0500)
committer Stefan Monnier <monnier@iro.umontreal.ca>
Thu, 17 Nov 2022 23:48:38 +0000 (18:48 -0500)
diff --cc src/itree.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Stefan Monnier <monnier@iro.umontreal.ca>
	Thu, 17 Nov 2022 23:48:38 +0000 (18:48 -0500)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Thu, 17 Nov 2022 23:48:38 +0000 (18:48 -0500)
		1	2
src/itree.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history