From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 1 Jan 2021 09:14:59 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4445
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c63ce13206de9a6d4018e97b98b1f6966ee666d8;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

8c1fe1e5ef Update copyright year to 2021
---

c63ce13206de9a6d4018e97b98b1f6966ee666d8