Merge branch 'scratch/long-lines-cleanup' into 'emacs-29'

author Gregory Heytings <gregory@heytings.org>

Fri, 12 May 2023 22:13:44 +0000 (00:13 +0200)

committer Gregory Heytings <gregory@heytings.org>

Fri, 12 May 2023 22:13:44 +0000 (00:13 +0200)
author Gregory Heytings <gregory@heytings.org>
Fri, 12 May 2023 22:13:44 +0000 (00:13 +0200)
committer Gregory Heytings <gregory@heytings.org>
Fri, 12 May 2023 22:13:44 +0000 (00:13 +0200)
diff --cc lisp/subr.el
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Gregory Heytings <gregory@heytings.org>
	Fri, 12 May 2023 22:13:44 +0000 (00:13 +0200)
committer	Gregory Heytings <gregory@heytings.org>
	Fri, 12 May 2023 22:13:44 +0000 (00:13 +0200)
		1	2
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history