; Merge from origin/emacs-30

The following commits were skipped:

cd6e2a0828 Fix copyright years by hand
7fa975adbc Update copyright year to 2025
This commit is contained in:
Eli Zaretskii 2025-01-04 09:59:53 -05:00
commit a1b687568f

Diff content is not available