Merge from origin/emacs-29

author Eli Zaretskii <eliz@gnu.org>

Sat, 21 Oct 2023 12:06:07 +0000 (08:06 -0400)

committer Eli Zaretskii <eliz@gnu.org>

Sat, 21 Oct 2023 12:06:07 +0000 (08:06 -0400)
author Eli Zaretskii <eliz@gnu.org>
Sat, 21 Oct 2023 12:06:07 +0000 (08:06 -0400)
committer Eli Zaretskii <eliz@gnu.org>
Sat, 21 Oct 2023 12:06:07 +0000 (08:06 -0400)
diff --cc ChangeLog.4
Simple merge
diff --cc src/xterm.c
Simple merge
author	Eli Zaretskii <eliz@gnu.org>
	Sat, 21 Oct 2023 12:06:07 +0000 (08:06 -0400)
committer	Eli Zaretskii <eliz@gnu.org>
	Sat, 21 Oct 2023 12:06:07 +0000 (08:06 -0400)
		1	2
ChangeLog.4	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history