From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 4 Dec 2021 05:30:32 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3619^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab828569ab134bca88381dc2f51b40bfff444a5c;p=emacs.git

Merge from origin/emacs-28

5d6f828799 Unbreak build after 9c222b9c1a7f91497a37567b4d7de3a511fff069.
---

ab828569ab134bca88381dc2f51b40bfff444a5c