From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 18 Feb 2022 08:38:42 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~2251
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2913c30b16652c72561ce4dfdf841b5b70e9991;p=emacs.git

Merge from origin/emacs-28

# Conflicts:
#	lisp/startup.el
---

c2913c30b16652c72561ce4dfdf841b5b70e9991