From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 1 Jan 2022 05:51:58 +0000 (+0100)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3322
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48bd406793c60a95bd23b15f3c5f7c9f2f228db2;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

89f205084b Avoid assertion violations with variable-weight fonts
---

48bd406793c60a95bd23b15f3c5f7c9f2f228db2