; 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...
This commit is contained in:
Stefan Kangas 2022-12-03 06:30:29 +01:00
commit 98327e3719

Diff content is not available