Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Tue, 7 Dec 2021 05:47:32 +0000 (06:47 +0100)

committer Stefan Kangas <stefan@marxist.se>

Tue, 7 Dec 2021 05:47:32 +0000 (06:47 +0100)
author Stefan Kangas <stefan@marxist.se>
Tue, 7 Dec 2021 05:47:32 +0000 (06:47 +0100)
committer Stefan Kangas <stefan@marxist.se>
Tue, 7 Dec 2021 05:47:32 +0000 (06:47 +0100)
diff --cc lisp/mouse.el
Simple merge
diff --cc lisp/progmodes/prog-mode.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Tue, 7 Dec 2021 05:47:32 +0000 (06:47 +0100)
committer	Stefan Kangas <stefan@marxist.se>
	Tue, 7 Dec 2021 05:47:32 +0000 (06:47 +0100)
		1	2
lisp/mouse.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/prog-mode.el	patch \|	diff1 \|	diff2 \|	blob \| history