From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 3 Dec 2022 05:30:29 +0000 (+0100)
Subject: ; Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98327e371938033f7ccefd1c5226cd102cb29ad1;p=emacs.git

; Merge from origin/emacs-29

The following commits were skipped:

24ca490d7d ; Fix a typo in .clang-format.
a48cd7bb9f ; Make clang-format format indent preprocessor blocks corr...
---

98327e371938033f7ccefd1c5226cd102cb29ad1