master 4724964ad24 4/5: ; Merge from origin/emacs-31

Eli Zaretskii <[email protected]> Sat, 27 Jun 2026 06:31:07 -0400 (EDT)

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

branch: master
commit 4724964ad24294ad1637d6a3e9baf8c053adb694
Merge: b1dce84c0b8 f2c4c1029d7
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    ; Merge from origin/emacs-31
    
    The following commit was skipped:
    
    f2c4c1029d7 VC-Dir: Fix removing empty directory entries