Commit a13d1f95 authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-27

0304f530 (origin/emacs-27) doc/misc/org.texi: Fix @dircategory
027da652 Fix display of minibuffer prompt in ido.el
5a21aaff rx: Use longest match for all-string 'or' forms (bug#37659)
2b12c2b6 Make sure not to mark directories
ff4ed4a0 ; Add a TODO
3a5129a1 vc-hg-dir-status-files: Fix when DIR is not repository root

# Conflicts:
#	etc/NEWS
parents 70d62e0c 0304f530
Pipeline #4783 passed with stage
in 59 minutes