master 036a2e7efcd 1/4: ; Merge from origin/emacs-31

Eli Zaretskii <[email protected]> Sat, 18 Jul 2026 06:00:09 -0400 (EDT)

Newsgroups	gmane.emacs.diffs
Message-ID	<[email protected]>

branch: master
commit 036a2e7efcdf161f6b28d1371d1e64ec25ffff57
Merge: b0d799c0161 82166cbd000
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    ; Merge from origin/emacs-31
    
    The following commit was skipped:
    
    82166cbd000 project.el: Bump version to 0.12