; Merge from origin/emacs-30

The following commit was skipped:

7ef805d6a4 Disable fontset-related workaround on non-Android systems
This commit is contained in:
Eli Zaretskii 2024-09-21 07:30:19 -04:00
commit 1cf6ff4362

Diff content is not available