master b1d827a428d 4/7: ; Merge from origin/emacs-31

Eli Zaretskii <[email protected]> Sat, 4 Jul 2026 04:30:55 -0400 (EDT)

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

branch: master
commit b1d827a428d224c7e536fea661f2d9b0c17eeee6
Merge: 9d616a13fa6 b8d3c4f8011
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    ; Merge from origin/emacs-31
    
    The following commit was skipped:
    
    b8d3c4f8011 Change Tramp version integrated in Emacs 31.1 (don't merge)