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

; Merge from origin/emacs-28

The following commit was skipped:

936009cfe5 Be more resilient towards errors during error handling
---

f7c4a620484bedcd0aad97a9f987e8d924b3070e