Merge from origin/emacs-27

author Glenn Morris <rgm@gnu.org>

Wed, 18 Mar 2020 14:50:36 +0000 (07:50 -0700)

committer Glenn Morris <rgm@gnu.org>

Wed, 18 Mar 2020 14:50:36 +0000 (07:50 -0700)
author Glenn Morris <rgm@gnu.org>
Wed, 18 Mar 2020 14:50:36 +0000 (07:50 -0700)
committer Glenn Morris <rgm@gnu.org>
Wed, 18 Mar 2020 14:50:36 +0000 (07:50 -0700)
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc src/macfont.m
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Wed, 18 Mar 2020 14:50:36 +0000 (07:50 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 18 Mar 2020 14:50:36 +0000 (07:50 -0700)
		1	2
lisp/emacs-lisp/package.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/macfont.m	patch \|	diff1 \|	diff2 \|	blob \| history