; Merge from origin/emacs-27

The following commit was skipped:

8c1fe1e5ef Update copyright year to 2021
This commit is contained in:
Paul Eggert 2021-01-01 01:14:59 -08:00
commit c63ce13206

Diff content is not available