Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Sat, 26 Sep 2020 13:31:50 +0000 (15:31 +0200)

committer Andrea Corallo <akrl@sdf.org>

Sat, 26 Sep 2020 13:31:50 +0000 (15:31 +0200)
author Andrea Corallo <akrl@sdf.org>
Sat, 26 Sep 2020 13:31:50 +0000 (15:31 +0200)
committer Andrea Corallo <akrl@sdf.org>
Sat, 26 Sep 2020 13:31:50 +0000 (15:31 +0200)
diff --cc lisp/help-fns.el
Simple merge
diff --cc lisp/subr.el
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Sat, 26 Sep 2020 13:31:50 +0000 (15:31 +0200)
committer	Andrea Corallo <akrl@sdf.org>
	Sat, 26 Sep 2020 13:31:50 +0000 (15:31 +0200)
		1	2
lisp/help-fns.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history