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

author Andrea Corallo <akrl@sdf.org>

Wed, 4 Mar 2020 11:07:53 +0000 (11:07 +0000)

committer Andrea Corallo <akrl@sdf.org>

Wed, 4 Mar 2020 11:07:53 +0000 (11:07 +0000)
author Andrea Corallo <akrl@sdf.org>
Wed, 4 Mar 2020 11:07:53 +0000 (11:07 +0000)
committer Andrea Corallo <akrl@sdf.org>
Wed, 4 Mar 2020 11:07:53 +0000 (11:07 +0000)
diff --cc lisp/help-fns.el
Simple merge
diff --cc src/emacs.c
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Wed, 4 Mar 2020 11:07:53 +0000 (11:07 +0000)
committer	Andrea Corallo <akrl@sdf.org>
	Wed, 4 Mar 2020 11:07:53 +0000 (11:07 +0000)
		1	2
lisp/help-fns.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history