Glenn Morris a13d1f9539 Merge from origin/emacs-27 ... 0304f53076 (origin/emacs-27) doc/misc/org.texi: Fix @dircategory 027da652a4 Fix display of minibuffer prompt in ido.el 5a21aaff46 rx: Use longest match for all-string 'or' forms (bug#37659) 2b12c2b6f2 Make sure not to mark directories ff4ed4a0ff ; Add a TODO 3a5129a1c9 vc-hg-dir-status-files: Fix when DIR is not repository root # Conflicts: # etc/NEWS		2020-02-13 07:50:30 -08:00
..
emacs	Merge from origin/emacs-27	2020-02-13 07:50:24 -08:00
lispintro	Merge from origin/emacs-27	2020-02-13 07:50:24 -08:00
lispref	Merge from origin/emacs-27	2020-02-13 07:50:30 -08:00
man	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
misc	Merge from origin/emacs-27	2020-02-13 07:50:30 -08:00