From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 11 Jun 2022 04:30:30 +0000 (+0200)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1910^2~85
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=355d2863125e0aaf86aa7482cd050368c73b5c5e;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

8436e0bee9 Update error message to reflect variable rename
---

355d2863125e0aaf86aa7482cd050368c73b5c5e