From: Glenn Morris <rgm@gnu.org>
Date: Mon, 4 Jan 2021 15:50:25 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8bf7258ae4ef2bfe2c4e09cb00516dd4ccbe214;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

585997d05a Fix broken build on AIX 7.2
---

e8bf7258ae4ef2bfe2c4e09cb00516dd4ccbe214