Merge remote-tracking branch 'savannah/master' into native-comp

author Andrea Corallo <akrl@sdf.org>

Fri, 19 Mar 2021 14:28:00 +0000 (15:28 +0100)

committer Andrea Corallo <akrl@sdf.org>

Fri, 19 Mar 2021 14:28:00 +0000 (15:28 +0100)
author Andrea Corallo <akrl@sdf.org>
Fri, 19 Mar 2021 14:28:00 +0000 (15:28 +0100)
committer Andrea Corallo <akrl@sdf.org>
Fri, 19 Mar 2021 14:28:00 +0000 (15:28 +0100)
diff --cc configure.ac
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/help.el
Simple merge
diff --cc lisp/loadup.el
Simple merge
diff --cc src/image.c
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Fri, 19 Mar 2021 14:28:00 +0000 (15:28 +0100)
committer	Andrea Corallo <akrl@sdf.org>
	Fri, 19 Mar 2021 14:28:00 +0000 (15:28 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/cl-macs.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/package.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/help.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/loadup.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history